- CS104 slave: use ConcurrentQueue to store received ASDUs

Author: mzillgith

lib60870/CS104/ClientConnection.cs

@@ -31,6 +31,7 @@
 
 using lib60870;
 using lib60870.CS101;
+using System.Collections.Concurrent;
 
 namespace lib60870.CS104
 {
@@ -78,7 +79,7 @@ private void DebugLog(string msg)
 
 		private Server server;
 
-		private Queue<ASDU> receivedASDUs = null;
+		private ConcurrentQueue<ASDU> receivedASDUs = null;
 		private Thread callbackThread = null;
 		private bool callbackThreadRunning = false;
 
@@ -118,8 +119,15 @@ private void ProcessASDUs()
 
 			while (callbackThreadRunning) {
 
-				while ((receivedASDUs.Count > 0) && (callbackThreadRunning) && (running))
-					HandleASDU (receivedASDUs.Dequeue ());
+				while ((receivedASDUs.Count > 0) && (callbackThreadRunning) && (running)) {
+				
+					ASDU asdu;
+
+					if (receivedASDUs.TryDequeue (out asdu)) {
+						HandleASDU (asdu);
+					}
+						
+				}
 
 				Thread.Sleep (50);
 			}
@@ -158,8 +166,7 @@ internal ClientConnection(Socket socket, TlsSecurityInformation tlsSecInfo, APCI
 			maxSentASDUs = apciParameters.K;
 			this.sentASDUs = new SentASDU[maxSentASDUs];
 
-			//TODO only needed when connection is activated
-			receivedASDUs = new Queue<ASDU> ();
+			receivedASDUs = new ConcurrentQueue<ASDU> ();
 			waitingASDUsHighPrio = new Queue<BufferFrame> ();
 
 			socketStream = new NetworkStream (socket);

tests/Test.cs

@@ -239,7 +239,7 @@ public void TestStepPositionInformation()
 		}
 
 		[Test()]
-		[Ignore("Ignore to save execution time")]
+		//[Ignore("Ignore to save execution time")]
 		public void TestConnectWhileAlreadyConnected()
 		{
 			ApplicationLayerParameters parameters = new ApplicationLayerParameters ();
@@ -284,7 +284,7 @@ public void TestConnectWhileAlreadyConnected()
 
 
 		[Test()]
-		[Ignore("Ignore to save execution time")]
+		//[Ignore("Ignore to save execution time")]
 		public void TestConnectSameConnectionMultipleTimes()
 		{
 			ApplicationLayerParameters parameters = new ApplicationLayerParameters ();
@@ -946,7 +946,7 @@ public void TestEncodeASDUsWithManyInformationObjectsSequenceOfIO() {
 		}
 
 		[Test()]
-		[Ignore("Ignore to save execution time")]
+		//[Ignore("Ignore to save execution time")]
 		public void TestSendTestFR() {
 			ApplicationLayerParameters clientParameters = new ApplicationLayerParameters ();
 			APCIParameters clientApciParamters = new APCIParameters ();
@@ -1002,7 +1002,7 @@ private static bool testSendTestFRTimeoutMasterRawMessageHandler(object param, b
 		/// doesn't receive the TESTFR_CON messages
 		/// </summary>
 		[Test()]
-		[Ignore("Ignore to save execution time")]
+		//[Ignore("Ignore to save execution time")]
 		public void TestSendTestFRTimeoutMaster() {
 			ApplicationLayerParameters clientParameters = new ApplicationLayerParameters ();
 			APCIParameters clientApciParamters = new APCIParameters ();
@@ -1075,7 +1075,7 @@ private static bool testSendTestFRTimeoutSlaveRawMessageHandler(object param, by
 		/// doesn't send the TESTFR_CON messages
 		/// </summary>
 		[Test()]
-		[Ignore("Ignore to save execution time")]
+		//[Ignore("Ignore to save execution time")]
 		public void TestSendTestFRTimeoutSlave() {
 			ApplicationLayerParameters clientParameters = new ApplicationLayerParameters ();
 			APCIParameters clientApciParamters = new APCIParameters ();