Changeset 392 for trunk/sources/HeuristicLab.CEDMA.Server

Timestamp:

07/22/08 21:16:39 (16 years ago)

Author:

gkronber

Message:

worked on unification of agents and runs (ticket #188)

File:

• trunk/sources/HeuristicLab.CEDMA.Server/RunScheduler.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.CEDMA.Server/RunScheduler.cs

@@ -45 +45 @@
     private object queueLock = new object();
     private Queue<Job> jobQueue;
+    private AutoResetEvent runningJobs = new AutoResetEvent(false);
 
     public RunScheduler(Database database, JobManager jobManager) {
@@ -80 +81 @@
         lock(queueLock) {
           jobQueue.Enqueue(job);
+          runningJobs.Set();
         }
       }
@@ -87 +89 @@
       try {
         while(true) {
-          int runningJobs;
-          lock(queueLock) runningJobs = jobQueue.Count;
-          if(runningJobs==0) Thread.Sleep(1000); // TASK: replace with waithandle
+          Job job = null;
+          lock(queueLock) if(jobQueue.Count > 0) job = jobQueue.Dequeue();
+          if(job == null) runningJobs.WaitOne();
           else {
-            Job job;
-            lock(queueLock) {
-              job = jobQueue.Dequeue();
-            }
             job.WaitHandle.WaitOne();
             job.WaitHandle.Close();
             lock(remoteCommLock) {
-              jobManager.EndExecuteOperation(job.Operation);
-              database.UpdateAgent(job.AgentId, ProcessStatus.Finished);
+              try {
+                jobManager.EndExecuteOperation(job.Operation);
+                database.UpdateAgent(job.AgentId, ProcessStatus.Finished);
+              } catch(JobExecutionException ex) {
+                database.UpdateAgent(job.AgentId, ProcessStatus.Error);
+              }
             }
           }