Changeset 13946

Timestamp:

06/29/16 00:50:42 (8 years ago)

Author:

thasling

Message:

#2615:
Fixed bug with reading queues
made all lock-objects static

Location:

branches/thasling/DistributedGA/DistributedGA.Core/Implementation

Files:

• PeerNetworkMessageHandler.cs (modified) (4 diffs)
• WcfMessageSender.cs (modified) (1 diff)
• WcfPeerListManager.cs (modified) (1 diff)

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

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

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

@@ -18 +18 @@
     private Timer timer; //sends cached messages to network in background
 
-    private Object timerLock = new Object();
+    private static Object timerLock = new Object();
 
     public void Init(PeerInfo source) {

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

@@ -16 +16 @@
     private Timer timer = null; //sends heartbeat to contact-server
 
-    private Object timerLock = new Object();
+    private static Object timerLock = new Object();
 
     private ChannelFactory<IContactService> myChannelFactory;