Changeset 13945

Timestamp:

06/29/16 00:24:10 (8 years ago)

Author:

thasling

Message:

#2615:
fixed major bug in PeerNetworkMessageHandler, because one queue was missing for the sending queues

File:

• branches/thasling/DistributedGA/DistributedGA.Core/Implementation/PeerNetworkMessageHandler.cs (modified) (4 diffs)

branches/thasling/DistributedGA/DistributedGA.Core/Implementation/PeerNetworkMessageHandler.cs

@@ -20 +20 @@
 
     //provides current population for the higher layer IMigrationOperator
-    //to queues are used to gather and and provide population more efficiently
+    //two queues are used to gather and and provide population more efficiently
     private object activeQueueLocker = new object();
-    private SizedConcurrentQueue<byte[]> writeQueue;
+    private SizedConcurrentQueue<byte[]> writeQueueOriginal;
+    private SizedConcurrentQueue<byte[]> writeQueueAlternative;
+
+    //queue for recieved items
     private SizedConcurrentQueue<byte[]> readQueue;
 
@@ -38 +41 @@
         }; // TODO: get own peerinfo
 
-        writeQueue = new SizedConcurrentQueue<byte[]>();
+        writeQueueOriginal = new SizedConcurrentQueue<byte[]>();
+        writeQueueAlternative = new SizedConcurrentQueue<byte[]>();
         readQueue = new SizedConcurrentQueue<byte[]>();
-        writeQueue.Limit = 1000;
-        readQueue.Limit = writeQueue.Limit;
+        writeQueueOriginal.Limit = 1000;
+        writeQueueAlternative.Limit = 1000;
+        readQueue.Limit = writeQueueOriginal.Limit;
 
         host = new WcfMessageService();
@@ -92 +97 @@
         byte[] item = null;
         lock (activeQueueLocker) {
-          var tmp = readQueue;
-          readQueue = writeQueue;
-          writeQueue = tmp;
+          //changing the current queue for storing items to send
+          //then read from the now unselect queue
+          var tmp = writeQueueAlternative;
+          writeQueueAlternative = writeQueueOriginal;
+          writeQueueOriginal = tmp;
         }
 
         //creating resultset
-        while (!readQueue.IsEmpty) {
-          if (readQueue.TryDequeue(out item)) {
+        while (!writeQueueAlternative.IsEmpty) {
+          if (writeQueueAlternative.TryDequeue(out item)) {
             res.Add(item);
           }
@@ -137 +144 @@
         lock (activeQueueLocker) {
           foreach (byte[] item in e.data) {
-            writeQueue.Enqueue(item);
+            writeQueueOriginal.Enqueue(item);
           }
         }