Changeset 13943 for branches/thasling/DistributedGA/DistributedGA.ContactServer

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

Location:

branches/thasling/DistributedGA/DistributedGA.ContactServer

Files:

• ContactServiceImpl.cs (modified) (2 diffs)
• DistributedGA.ContactServer.csproj (modified) (1 diff)

branches/thasling/DistributedGA/DistributedGA.ContactServer/ContactServiceImpl.cs

@@ -18 +18 @@
 
     private Object logLock = new Object();
+
+    private Object timerLock = new Object();//if elapsed takes too long, another thread also enters the method
 
     public ContactServiceImpl() {
@@ -78 +80 @@
 
     private void CleanUpContactTable(object sender, ElapsedEventArgs e) {
-      DateTime deadline = DateTime.Now;
-      //collect items to remove
-      List<PeerInfo> itemsToDelete = new List<PeerInfo>();
-      foreach (PeerInfo pi in allPeers.Keys) {
-        DateTime tmp;
-        if (allPeers.TryGetValue(pi, out tmp)) {
-          //if (tmp.AddHours(1f) < deadline)
-          if (tmp.AddMinutes(1) < deadline)  //TODO
+      lock (timerLock) {
+        DateTime deadline = DateTime.Now;
+        //collect items to remove
+        List<PeerInfo> itemsToDelete = new List<PeerInfo>();
+        foreach (PeerInfo pi in allPeers.Keys) {
+          DateTime tmp;
+          if (allPeers.TryGetValue(pi, out tmp)) {
+            //if (tmp.AddHours(1f) < deadline)
+            if (tmp.AddMinutes(1) < deadline)  //TODO
                     {
-            //if (tmp < deadline.AddHours(1f)) {
-            itemsToDelete.Add(pi);
+              //if (tmp < deadline.AddHours(1f)) {
+              itemsToDelete.Add(pi);
+            }
           }
         }
-      }
-      //remove items
-      foreach (PeerInfo pi in itemsToDelete) {
-        DateTime tmp;
-        allPeers.TryRemove(pi, out tmp);
-        Console.WriteLine(string.Format("Removed peer {0}:{1} from dictionary because last access was: {2}", pi.IpAddress, pi.Port, tmp));
+        //remove items
+        foreach (PeerInfo pi in itemsToDelete) {
+          DateTime tmp;
+          allPeers.TryRemove(pi, out tmp);
+          Console.WriteLine(string.Format("Removed peer {0}:{1} from dictionary because last access was: {2}", pi.IpAddress, pi.Port, tmp));
+        }
       }
     }

branches/thasling/DistributedGA/DistributedGA.ContactServer/DistributedGA.ContactServer.csproj

@@ -55 +55 @@
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>