Changeset 8807

Timestamp:

10/15/12 13:35:33 (12 years ago)

Author:

svonolfe

Message:

Fixed threading issues (#1955)

Location:

branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3

Files:

• Optimizers/DynamicPDPOptimization.cs (modified) (2 diffs)
• PickupDeliveryOptimization.cs (modified) (1 diff)

branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3/Optimizers/DynamicPDPOptimization.cs

@@ -229 +229 @@
     protected virtual void EndOptimization() {
       SignalWaitHandle();
+      running = false;
     }
 
@@ -340 +341 @@
           RelocateVehicles(simulationTime + GetTimeStep(), finish);
 
-        if (finish)
-          running = false;
-        else
+        if (!finish)
           SignalWaitHandle();
       }

branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3/PickupDeliveryOptimization.cs

@@ -337 +337 @@
       InitWaitHandle(synchronized);
 
-      EventWaitHandle wh = new EventWaitHandle(false, EventResetMode.ManualReset);
-
-      cts = new CancellationTokenSource();
-      optThread = new Thread(delegate() {
-        wh.Set();
-        Optimize(cts.Token);
-      });
-      optThread.IsBackground = true;
-      optThread.Start();
-
-      wh.WaitOne();
+      using (EventWaitHandle wh = new EventWaitHandle(false, EventResetMode.ManualReset)) {
+        cts = new CancellationTokenSource();
+        optThread = new Thread(delegate() {
+          wh.Set();
+          Optimize(cts.Token);
+        });
+        optThread.IsBackground = true;
+        optThread.Start();
+
+        wh.WaitOne();
+      }
     }