Changeset 2108

Timestamp:

06/25/09 17:02:24 (15 years ago)

Author:

kgrading

Message:

various updates (#467)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Core/3.2/ConfigurationManager/ConfigManager.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.ExecutionEngine/3.2/Executor.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/ConfigurationManager/ConfigManager.cs

@@ -130 +130 @@
         foreach (KeyValuePair<Guid, Executor> kvp in engines) {
           Executor e = kvp.Value;
-          if (!e.Running && e.CurrentMessage == MessageContainer.MessageType.NoMessage) 
+          if (!e.JobIsFinished) 
             prog[e.JobId] = e.Progress;
         }

trunk/sources/HeuristicLab.Hive.Client.ExecutionEngine/3.2/Executor.cs

@@ -38 +38 @@
     public MessageContainer.MessageType CurrentMessage { get; set; }
     public MessageQueue Queue { get; set; }
-    
+
+    public bool JobIsFinished { get; set; }
+
     public bool Running {
       get {
@@ -77 +79 @@
 
     void Job_JobStopped(object sender, EventArgs e) {
-      if (CurrentMessage == MessageContainer.MessageType.NoMessage)
+      if (CurrentMessage == MessageContainer.MessageType.NoMessage) {
         Queue.AddMessage(new MessageContainer(MessageContainer.MessageType.FinishedJob, JobId));
-      else if (CurrentMessage == MessageContainer.MessageType.RequestSnapshot)
-        Queue.AddMessage(new MessageContainer(MessageContainer.MessageType.SnapshotReady, JobId));
-      else if (CurrentMessage == MessageContainer.MessageType.AbortJob)
-        Queue.AddMessage(new MessageContainer(MessageContainer.MessageType.JobAborted, JobId));
+        JobIsFinished = true;
+      } else if (CurrentMessage == MessageContainer.MessageType.RequestSnapshot) {
+          Queue.AddMessage(new MessageContainer(MessageContainer.MessageType.SnapshotReady, JobId));
+      } else if (CurrentMessage == MessageContainer.MessageType.AbortJob) {
+          Queue.AddMessage(new MessageContainer(MessageContainer.MessageType.JobAborted, JobId));
+      }
     }
 
@@ -125 +129 @@
     public Executor() {
       CurrentMessage = MessageContainer.MessageType.NoMessage;
+      JobIsFinished = false;
       Job = new TestJob();
     }