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

Timestamp:

12/20/10 19:58:01 (13 years ago)

Author:

ascheibe

Message:

#1233

• more tests for the hive slave
• implemented a better way to write tests for the slave
• get rid of MessageTypes for core and executor
• various improvements in core and executor (better communication, bugfixes,...)

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.Slave/3.4/Executor.cs (modified) (13 diffs)

branches/HeuristicLab.Hive-3.4/sources

@@ +1 @@
+*.suo
 HeuristicLab.Hive-3.4.suo
 TestResults
-HeuristicLab.Hive 3.4.suo

@@ +1 @@
+*.suo
 HeuristicLab.Hive-3.4.suo
 TestResults
-HeuristicLab.Hive 3.4.suo

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

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Clients.Hive.Slave;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Services.Hive.Common;
 using HeuristicLab.Hive;
+using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Services.Hive.Common.DataTransfer;
-using System.Collections.Generic;
-using HeuristicLab.Clients.Hive.Slave;
-using HeuristicLab.PluginInfrastructure;
-
-                                             
+
+
 namespace HeuristicLab.Clients.Hive.Salve {
   public class Executor : MarshalByRefObject, IDisposable {
     public Guid JobId { get; set; }
     public IJob Job { get; set; }
-    public MessageContainer.MessageType CurrentMessage { get; set; }
-    public Core core { get; set; }    
-        
+    private bool wasJobAborted = false;
+    public Core core { get; set; }
+
     private Exception currentException;
     public String CurrentException {
@@ -49 +48 @@
       }
     }
-    
+
     public ExecutionState ExecutionState {
       get {
@@ -73 +72 @@
         RegisterJobEvents();
 
-        if (Job.CollectChildJobs) {          
+        if (Job.CollectChildJobs) {
           IEnumerable<JobData> childjobs = WcfService.Instance.GetChildJobs(JobId);
           Job.Resume(childjobs.Select(j => PersistenceUtil.Deserialize<IJob>(j.Data)));
@@ -82 +81 @@
       }
       catch (Exception e) {
-        this.currentException = e;        
+        this.currentException = e;
       }
     }
@@ -91 +90 @@
       }
       catch (Exception e) {
-        this.currentException = e;        
+        this.currentException = e;
       }
     }
 
     public void Abort() {
-      CurrentMessage = MessageContainer.MessageType.AbortJob;
+      wasJobAborted = true;
       if ((ExecutionState == ExecutionState.Started) || (ExecutionState == ExecutionState.Paused)) {
         Job.Stop();
@@ -105 +104 @@
 
     private void RegisterJobEvents() {
-      //TODO: warum gibt es jobStopped und jobfailed nicht mehr? 
       Job.JobStopped += new EventHandler(Job_JobStopped);
       Job.JobFailed += new EventHandler(Job_JobFailed);
@@ -123 +121 @@
     private List<Guid> FindPluginsNeeded(IJob obj) {
       List<Guid> guids = new List<Guid>();
-      foreach(IPluginDescription desc in PluginUtil.GetDeclaringPlugins(obj)) {        
+      foreach (IPluginDescription desc in PluginUtil.GetDeclaringPlugins(obj)) {
       }
       throw new NotImplementedException("FindPluginsNeeded for Job_NewChildJob");
@@ -147 +145 @@
       // Pause the job and send it back to the hive. The server will awake it when all child-jobs are finished
       this.Job.CollectChildJobs = true;
-      
+
       JobData jdata = new JobData();
       jdata.Data = PersistenceUtil.Serialize(Job);
       jdata.JobId = this.JobId;
-      
+
       core.PauseJob(jdata);
     }
@@ -167 +165 @@
 
     private void Job_JobStopped(object sender, EventArgs e) {
-     if (CurrentMessage == MessageContainer.MessageType.AbortJob) {
-       core.KillAppDomain(JobId);
+      if (wasJobAborted) {
+        core.KillAppDomain(JobId);
       } else {
         core.SendFinishedJob(JobId);
@@ -176 +174 @@
     public JobData GetFinishedJob() {
       if (Job == null) {
-        throw new InvalidStateException("Job is null"); 
-      }              
+        throw new InvalidStateException("Job is null");
+      }
 
       if (Job.ExecutionState == HeuristicLab.Core.ExecutionState.Started) {
@@ -185 +183 @@
 
       if (Job.ExecutionState == HeuristicLab.Core.ExecutionState.Started) {
-        throw new InvalidStateException("Job is still running"); 
+        throw new InvalidStateException("Job is still running");
       } else {
         JobData jdata = new JobData();
@@ -192 +190 @@
         return jdata;
       }
-    }   
-   
+    }
+
     public Executor() {
-      // CurrentMessage = MessageContainer.MessageType.NoMessage; [chn] check usage of 'CurrentMessage'
     }
 
@@ -201 +198 @@
       if (Job != null)
         DeregisterJobEvents();
-      //Queue = null;
       Job = null;
     }

@@ +1 @@
+*.suo
 HeuristicLab.Hive-3.4.suo
 TestResults
-HeuristicLab.Hive 3.4.suo