Changeset 6725 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/SlaveTask.cs

Timestamp:

09/08/11 16:38:28 (13 years ago)

Author:

ascheibe

Message:

#1233 more renaming for more consistency

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/SlaveTask.cs (moved) (moved from branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/SlaveJob.cs) (14 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/SlaveTask.cs

@@ -31 +31 @@
 
   /// <summary>
-  ///  Manages a single job and it's appdomain. 
+  ///  Manages a single task and it's appdomain. 
   /// </summary>
-  public class SlaveJob : MarshalByRefObject {
+  public class SlaveTask : MarshalByRefObject {
     private Executor executor;
     private AppDomain appDomain;
@@ -41 +41 @@
     private PluginManager pluginManager;
     private ILog log;
-    public Guid JobId { get; private set; }
+    public Guid TaskId { get; private set; }
     public bool IsPrepared { get; private set; }
 
@@ -54 +54 @@
     }
 
-    public SlaveJob(PluginManager pluginManager, int coresNeeded, ILog log) {
+    public SlaveTask(PluginManager pluginManager, int coresNeeded, ILog log) {
       this.pluginManager = pluginManager;
       this.coresNeeded = coresNeeded;
@@ -63 +63 @@
     }
 
-    public void StartJobAsync(Task job, TaskData jobData) {
+    public void StartJobAsync(Task task, TaskData taskData) {
       try {
-        this.JobId = job.Id;
-        Prepare(job);
-        StartJobInAppDomain(jobData);
+        this.TaskId = task.Id;
+        Prepare(task);
+        StartTaskInAppDomain(taskData);
       }
       catch (Exception) {
@@ -76 +76 @@
     }
 
-    public void PauseJob() {
+    public void PauseTask() {
       if (!IsPrepared) throw new AppDomainNotCreatedException();
       if (!executor.IsPausing && !executor.IsStopping) executor.Pause();
     }
 
-    public void StopJob() {
+    public void StopTask() {
       if (!IsPrepared) throw new AppDomainNotCreatedException();
       if (!executor.IsPausing && !executor.IsStopping) executor.Stop();
     }
 
-    private void Prepare(Task job) {
-      string pluginDir = Path.Combine(pluginManager.PluginTempBaseDir, job.Id.ToString());
+    private void Prepare(Task task) {
+      string pluginDir = Path.Combine(pluginManager.PluginTempBaseDir, task.Id.ToString());
       string configFileName;
-      pluginManager.PreparePlugins(job, out configFileName);
-      appDomain = CreateAppDomain(job, pluginDir, configFileName);
+      pluginManager.PreparePlugins(task, out configFileName);
+      appDomain = CreateAppDomain(task, pluginDir, configFileName);
       IsPrepared = true;
     }
 
-    private AppDomain CreateAppDomain(Task job, String pluginDir, string configFileName) {
-      if (job.IsPrivileged) {
-        appDomain = SandboxManager.CreateAndInitPrivilegedSandbox(job.Id.ToString(), pluginDir, Path.Combine(pluginDir, configFileName));
+    private AppDomain CreateAppDomain(Task task, String pluginDir, string configFileName) {
+      if (task.IsPrivileged) {
+        appDomain = SandboxManager.CreateAndInitPrivilegedSandbox(task.Id.ToString(), pluginDir, Path.Combine(pluginDir, configFileName));
       } else {
-        appDomain = SandboxManager.CreateAndInitSandbox(job.Id.ToString(), pluginDir, Path.Combine(pluginDir, configFileName));
+        appDomain = SandboxManager.CreateAndInitSandbox(task.Id.ToString(), pluginDir, Path.Combine(pluginDir, configFileName));
       }
       appDomain.UnhandledException += new UnhandledExceptionEventHandler(AppDomain_UnhandledException);
@@ -105 +105 @@
       executor = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
 
-      executor.JobId = job.Id;
-      executor.CoresNeeded = job.CoresNeeded;
-      executor.MemoryNeeded = job.MemoryNeeded;
+      executor.TaskId = task.Id;
+      executor.CoresNeeded = task.CoresNeeded;
+      executor.MemoryNeeded = task.MemoryNeeded;
       return appDomain;
     }
 
-    private void StartJobInAppDomain(TaskData jobData) {
-      executor.Start(jobData.Data);
+    private void StartTaskInAppDomain(TaskData taskData) {
+      executor.Start(taskData.Data);
       waitForStartBeforeKillSem.Release();
       StartExecutorMonitoringThread();
@@ -118 +118 @@
 
     public void DisposeAppDomain() {
-      log.LogMessage(string.Format("Shutting down Appdomain for Task {0}", JobId));
+      log.LogMessage(string.Format("Shutting down Appdomain for Task {0}", TaskId));
       StopExecutorMonitoringThread();
 
@@ -145 +145 @@
         }
       }
-      pluginManager.DeletePluginsForJob(JobId);
+      pluginManager.DeletePluginsForJob(TaskId);
       GC.Collect();
     }
@@ -154 +154 @@
     }
 
-    public TaskData GetJobData() {
-      return executor.GetJobData();
+    public TaskData GetTaskData() {
+      return executor.GetTaskData();
     }
 
@@ -176 +176 @@
     /// Because the executor is in an appdomain and is not able to call back 
     /// (because of security -> lease time for marshall-by-ref object is 5 min),
-    /// we have to poll the executor for events we have to react to (e.g. job finished...)    
+    /// we have to poll the executor for events we have to react to (e.g. task finished...)    
     /// </summary>
     private void MonitorExecutor() {
@@ -184 +184 @@
 
         switch (message.MessageType) {
-          case ExecutorMessageType.JobStarted:
-            OnJobStarted();
-            break;
-
-          case ExecutorMessageType.JobPaused:
-            executorMonitoringRun = false;
-            OnJobPaused();
-            DisposeAppDomain();
-            break;
-
-          case ExecutorMessageType.JobStopped:
-            executorMonitoringRun = false;
-            OnJobStopped();
-            DisposeAppDomain();
-            break;
-
-          case ExecutorMessageType.JobFailed:
-            executorMonitoringRun = false;
-            OnJobFailed(new JobFailedException(executor.CurrentExceptionStr));
+          case ExecutorMessageType.TaskStarted:
+            OnTaskStarted();
+            break;
+
+          case ExecutorMessageType.TaskPaused:
+            executorMonitoringRun = false;
+            OnTaskPaused();
+            DisposeAppDomain();
+            break;
+
+          case ExecutorMessageType.TaskStopped:
+            executorMonitoringRun = false;
+            OnTaskStopped();
+            DisposeAppDomain();
+            break;
+
+          case ExecutorMessageType.TaskFailed:
+            executorMonitoringRun = false;
+            OnTaskFailed(new TaskFailedException(executor.CurrentExceptionStr));
             DisposeAppDomain();
             break;
@@ -216 +216 @@
               OnExceptionOccured(executor.CurrentException);
             } else {
-              OnExceptionOccured(new Exception(string.Format("Unknow exception occured in Executor for job {0}", JobId)));
+              OnExceptionOccured(new Exception(string.Format("Unknow exception occured in Executor for task {0}", TaskId)));
             }
             break;
@@ -224 +224 @@
     #endregion
 
-    public event EventHandler<EventArgs<Guid>> JobStarted;
-    private void OnJobStarted() {
-      var handler = JobStarted;
-      if (handler != null) handler(this, new EventArgs<Guid>(this.JobId));
-    }
-
-    public event EventHandler<EventArgs<Guid>> JobStopped;
-    private void OnJobStopped() {
-      var handler = JobStopped;
-      if (handler != null) handler(this, new EventArgs<Guid>(this.JobId));
-    }
-
-    public event EventHandler<EventArgs<Guid>> JobPaused;
-    private void OnJobPaused() {
-      var handler = JobPaused;
-      if (handler != null) handler(this, new EventArgs<Guid>(this.JobId));
-    }
-
-    public event EventHandler<EventArgs<Guid>> JobAborted;
-    private void OnJobAborted() {
-      var handler = JobAborted;
-      if (handler != null) handler(this, new EventArgs<Guid>(this.JobId));
-    }
-
-    public event EventHandler<EventArgs<Guid, Exception>> JobFailed;
-    private void OnJobFailed(Exception exception) {
-      var handler = JobFailed;
-      if (handler != null) handler(this, new EventArgs<Guid, Exception>(this.JobId, exception));
+    public event EventHandler<EventArgs<Guid>> TaskStarted;
+    private void OnTaskStarted() {
+      var handler = TaskStarted;
+      if (handler != null) handler(this, new EventArgs<Guid>(this.TaskId));
+    }
+
+    public event EventHandler<EventArgs<Guid>> TaskStopped;
+    private void OnTaskStopped() {
+      var handler = TaskStopped;
+      if (handler != null) handler(this, new EventArgs<Guid>(this.TaskId));
+    }
+
+    public event EventHandler<EventArgs<Guid>> TaskPaused;
+    private void OnTaskPaused() {
+      var handler = TaskPaused;
+      if (handler != null) handler(this, new EventArgs<Guid>(this.TaskId));
+    }
+
+    public event EventHandler<EventArgs<Guid>> TaskAborted;
+    private void OnTaskAborted() {
+      var handler = TaskAborted;
+      if (handler != null) handler(this, new EventArgs<Guid>(this.TaskId));
+    }
+
+    public event EventHandler<EventArgs<Guid, Exception>> TaskFailed;
+    private void OnTaskFailed(Exception exception) {
+      var handler = TaskFailed;
+      if (handler != null) handler(this, new EventArgs<Guid, Exception>(this.TaskId, exception));
     }
 
@@ -257 +257 @@
     private void OnExceptionOccured(Exception exception) {
       var handler = ExceptionOccured;
-      if (handler != null) handler(this, new EventArgs<Guid, Exception>(this.JobId, exception));
+      if (handler != null) handler(this, new EventArgs<Guid, Exception>(this.TaskId, exception));
     }
   }