Changeset 13943 for branches/thasling/DistributedGA/DistributedGA.Core/Implementation/WcfMessageSender.cs

Timestamp:

06/28/16 17:03:36 (8 years ago)

Author:

thasling

Message:

#2615:
implemented lock for timers, because if elapsed-method takes longer than the timer to elapse again, the method is called by another thread conccurently

File:

• branches/thasling/DistributedGA/DistributedGA.Core/Implementation/WcfMessageSender.cs (modified) (2 diffs)

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();
+
     public void Init(PeerInfo source) {
       myself = source;
       bufferedMessages = new SizedConcurrentQueue<KeyValuePair<PeerInfo, byte[][]>>();
-      bufferedMessages.Limit = 1000;
+      bufferedMessages.Limit = 100000;
       timer = new Timer(1000 * 60); //each 5 minutes
       timer.Elapsed += GenerateSendingTasks;
@@ -52 +54 @@
     /// <param name="data">data to send</param>
     private void SendDataFromQueue(PeerInfo destination, byte[][] data) {
-      try {
-        Console.WriteLine(string.Format("Sending data to {0}:{1} in the background...", destination.IpAddress, destination.Port));
-        var serviceUrl = "DistributedGA.svc";
-        var baseUri = new Uri(string.Concat("net.tcp://", destination.IpAddress, ":", destination.Port, "/DistributedGA"));
-        var serviceUri = new Uri(baseUri, serviceUrl);
+      lock (timerLock) {
+        try {
+          Console.WriteLine(string.Format("Sending data to {0}:{1} in the background...", destination.IpAddress, destination.Port));
+          var serviceUrl = "DistributedGA.svc";
+          var baseUri = new Uri(string.Concat("net.tcp://", destination.IpAddress, ":", destination.Port, "/DistributedGA"));
+          var serviceUri = new Uri(baseUri, serviceUrl);
 
-        var binding = new NetTcpBinding();
-        var endpoint = new EndpointAddress(serviceUri);
-        using (var myChannelFactory = new ChannelFactory<IMessageContract>(binding, endpoint)) {
-          using (IClientChannel client = (IClientChannel)myChannelFactory.CreateChannel()) {
-            ((IMessageContract)client).SendData(myself, data); //maybe timout exception...
+          var binding = new NetTcpBinding();
+          var endpoint = new EndpointAddress(serviceUri);
+          using (var myChannelFactory = new ChannelFactory<IMessageContract>(binding, endpoint)) {
+            using (IClientChannel client = (IClientChannel)myChannelFactory.CreateChannel()) {
+              ((IMessageContract)client).SendData(myself, data); //maybe timout exception...
+            }
           }
         }
+        catch { } //if maybe sending failed (because of connection lost, etc.): just ignore
       }
-      catch { } //if maybe sending failed (because of connection lost, etc.): just ignore
     }
   }