Changeset 6112 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Executor.cs

Timestamp:

05/03/11 18:08:42 (13 years ago)

Author:

ascheibe

Message:

#1233

• HeartbeatManager: don't sleep while starting jobs
• Executor: make Start() blocking
• shutdown properly if an uncaught exception is thrown

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Executor.cs (modified) (5 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Executor.cs

@@ -37 +37 @@
     public Core Core { get; set; }
     private Semaphore pauseStopSem = new Semaphore(0, 1);
+    private Semaphore startJobSem = new Semaphore(0, 1);
 
     public bool SendHeartbeatForExecutor { get; set; }
@@ -86 +87 @@
         } else {
           Job.Start();
-
+          startJobSem.WaitOne();
         }
       }
@@ -140 +141 @@
       Job.DeleteChildJobs += new EventHandler(Job_DeleteChildJobs);
       Job.JobPaused += new EventHandler(Job_JobPaused);
+      Job.JobStarted += new EventHandler(Job_JobStarted);
     }
 
@@ -149 +151 @@
       Job.DeleteChildJobs -= new EventHandler(Job_DeleteChildJobs);
       Job.JobPaused -= new EventHandler(Job_JobPaused);
+      Job.JobStarted -= new EventHandler(Job_JobStarted);
     }
 
@@ -237 +240 @@
     private void Job_JobPaused(object sender, EventArgs e) {
       pauseStopSem.Release();
+    }
+
+    void Job_JobStarted(object sender, EventArgs e) {
+      startJobSem.Release();
     }