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

Timestamp:

02/07/11 11:44:15 (14 years ago)

Author:

ascheibe

Message:

#1233

• added Pause/Stop/Abort mechanisms to the slave
• added Pause to Jobs

File:

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

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

@@ -35 +35 @@
     public IJob Job { get; set; }
     private bool wasJobAborted = false;
-    public Core core { get; set; }
+    public Core Core { get; set; }
 
     private Exception currentException;
@@ -84 +84 @@
     }
 
-    public void StartOnlyJob() {
-      try {
-        Job.Start();
-      }
-      catch (Exception e) {
-        this.currentException = e;
-      }
+    public void Pause() {
+      Job.Pause();
+      
     }
 
-    public void Pause() {
-      Job.Pause();
-    }
-
-    public void Abort() {
+    public void Stop() {
       wasJobAborted = true;
       if ((ExecutionState == ExecutionState.Started) || (ExecutionState == ExecutionState.Paused)) {
@@ -153 +145 @@
       jdata.JobId = this.JobId;
 
-      core.PauseJob(jdata);
+      Core.PauseWaitJob(jdata);
     }
 
@@ -164 +156 @@
       HeuristicLab.Common.EventArgs<Exception> ex = (HeuristicLab.Common.EventArgs<Exception>)e;
       currentException = ex.Value;
-      core.SendFinishedJob(JobId);
+      Core.SendFinishedJob(JobId);
     }
 
     private void Job_JobStopped(object sender, EventArgs e) {
       if (wasJobAborted) {
-        core.KillAppDomain(JobId);
+        Core.KillAppDomain(JobId);
       } else {
-        core.SendFinishedJob(JobId);
+        Core.SendFinishedJob(JobId);
       }
     }