Changeset 4135 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs

Timestamp:

08/03/10 11:18:39 (14 years ago)

Author:

cneumuel

Message:

added HeuristicLab.Hive.Tracing (#1092)

File:

• branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs (modified) (4 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs

@@ -270 +270 @@
     }
 
+    public void Stop() {
+      this.ExecutionState = Core.ExecutionState.Stopped;
+      foreach (JobItem jobItem in jobItems) {
+        AbortJob(jobItem.JobDto.Id);
+      }
+      OnStopped();
+    }
+
     private void CreateResultPollingThreads() {
       foreach(JobItem jobItem in JobItems) {
-        resultPollingThreads.Add(jobItem.JobDto.Id, CreateResultPollingThread(jobItem.JobDto));
+        if (!resultPollingThreads.ContainsKey(jobItem.JobDto.Id)) {
+          resultPollingThreads.Add(jobItem.JobDto.Id, CreateResultPollingThread(jobItem.JobDto));
+        }
       }
     }
@@ -280 +290 @@
       CreateResultPollingThreads();
       foreach (Thread pollingThread in resultPollingThreads.Values) {
-        pollingThread.Start();
+        if (pollingThread.ThreadState != System.Threading.ThreadState.Running) {
+          pollingThread.Start();
+        }
       }
       this.IsPollingResults = true;
@@ -317 +329 @@
     }
 
-    public void Stop() {
-      foreach(JobItem jobItem in jobItems) {
-        AbortJob(jobItem.JobDto.Id);
-      }
-    }
-
     public void AbortJob(Guid jobId) {
       IExecutionEngineFacade executionEngineFacade = GetExecutionEngineFacade();
-      executionEngineFacade.AbortJob(jobId);
-      resultPollingThreads[jobId].Interrupt();
-      GetJobItemById(jobId).LogMessage("Aborting Job");
-    }
+      Response response = executionEngineFacade.AbortJob(jobId);
+      GetJobItemById(jobId).LogMessage("Aborting Job: " + response.StatusMessage);
+    }
+
     #endregion
 
@@ -387 +393 @@
             GetJobItemById(job.Id).LogMessage("Response: " + response.StatusMessage);
 
-            if (response.Obj != null) {
-              UpdateJobItem(response.Obj);
-            }
+            UpdateJobItem(response.Obj);
+
+            if (response.Obj.State == State.Abort) {
+              // job is aborted, don't poll for results anymore
+              GetJobItemById(job.Id).LogMessage("Job successfully aborted");
+              return;
+            }            
 
             // loop while