Changeset 6721 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Core.cs

Timestamp:

09/08/11 13:41:25 (13 years ago)

Author:

ascheibe

Message:

#1233 Review comments: renamed Job to Task

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Core.cs (modified) (17 diffs)

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

@@ -29 +29 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using TS = System.Threading.Tasks;
 
 
@@ -148 +149 @@
     /// <param name="container">The container, containing the message</param>
     private void DetermineAction(MessageContainer container) {
-      clientCom.LogMessage(string.Format("Message: {0} for job: {1} ", container.Message.ToString(), container.JobId));
+      clientCom.LogMessage(string.Format("Message: {0} for job: {1} ", container.Message.ToString(), container.TaskId));
 
       if (container is ExecutorMessageContainer<Guid>) {
@@ -156 +157 @@
         switch (container.Message) {
           case MessageContainer.MessageType.CalculateJob:
-            CalculateJobAsync(container.JobId);
+            CalculateJobAsync(container.TaskId);
             break;
           case MessageContainer.MessageType.AbortJob:
-            AbortJobAsync(container.JobId);
+            AbortJobAsync(container.TaskId);
             break;
           case MessageContainer.MessageType.StopJob:
-            StopJobAsync(container.JobId);
+            StopJobAsync(container.TaskId);
             break;
           case MessageContainer.MessageType.PauseJob:
-            PauseJobAsync(container.JobId);
+            PauseJobAsync(container.TaskId);
             break;
           case MessageContainer.MessageType.StopAll:
@@ -195 +196 @@
 
     private void CalculateJobAsync(Guid jobId) {
-      Task.Factory.StartNew(HandleCalculateJob, jobId)
+      TS.Task.Factory.StartNew(HandleCalculateJob, jobId)
       .ContinueWith((t) => {
         SlaveStatusInfo.IncrementExceptionOccured();
@@ -203 +204 @@
 
     private void StopJobAsync(Guid jobId) {
-      Task.Factory.StartNew(HandleStopJob, jobId)
+      TS.Task.Factory.StartNew(HandleStopJob, jobId)
        .ContinueWith((t) => {
          SlaveStatusInfo.IncrementExceptionOccured();
@@ -211 +212 @@
 
     private void PauseJobAsync(Guid jobId) {
-      Task.Factory.StartNew(HandlePauseJob, jobId)
+      TS.Task.Factory.StartNew(HandlePauseJob, jobId)
        .ContinueWith((t) => {
          SlaveStatusInfo.IncrementExceptionOccured();
@@ -219 +220 @@
 
     private void AbortJobAsync(Guid jobId) {
-      Task.Factory.StartNew(HandleAbortJob, jobId)
+      TS.Task.Factory.StartNew(HandleAbortJob, jobId)
        .ContinueWith((t) => {
          SlaveStatusInfo.IncrementExceptionOccured();
@@ -228 +229 @@
     private void HandleCalculateJob(object jobIdObj) {
       Guid jobId = (Guid)jobIdObj;
-      Job job = null;
+      Task job = null;
       int usedCores = 0;
       try {
@@ -236 +237 @@
         if (ConfigManager.GetFreeMemory() < job.MemoryNeeded) throw new OutOfMemoryException();
         SlaveStatusInfo.IncrementUsedCores(job.CoresNeeded); usedCores = job.CoresNeeded;
-        JobData jobData = wcfService.GetJobData(jobId);
+        TaskData jobData = wcfService.GetJobData(jobId);
         if (jobData == null) throw new JobDataNotFoundException(jobId);
-        job = wcfService.UpdateJobState(jobId, JobState.Calculating, null);
+        job = wcfService.UpdateJobState(jobId, TaskState.Calculating, null);
         if (job == null) throw new JobNotFoundException(jobId);
         jobManager.StartJobAsync(job, jobData);
@@ -255 +256 @@
       }
       catch (OutOfCoresException) {
-        wcfService.UpdateJobState(jobId, JobState.Waiting, "No more cores available");
+        wcfService.UpdateJobState(jobId, TaskState.Waiting, "No more cores available");
         throw;
       }
       catch (OutOfMemoryException) {
-        wcfService.UpdateJobState(jobId, JobState.Waiting, "No more memory available");
+        wcfService.UpdateJobState(jobId, TaskState.Waiting, "No more memory available");
         throw;
       }
       catch (Exception e) {
         SlaveStatusInfo.DecrementUsedCores(usedCores);
-        wcfService.UpdateJobState(jobId, JobState.Waiting, e.ToString()); // unknown internal error - report and set waiting again
+        wcfService.UpdateJobState(jobId, TaskState.Waiting, e.ToString()); // unknown internal error - report and set waiting again
         throw;
       }
@@ -272 +273 @@
       Guid jobId = (Guid)jobIdObj;
       try {
-        Job job = wcfService.GetJob(jobId);
+        Task job = wcfService.GetJob(jobId);
         if (job == null) throw new JobNotFoundException(jobId);
         jobManager.StopJobAsync(jobId);
@@ -290 +291 @@
       Guid jobId = (Guid)jobIdObj;
       try {
-        Job job = wcfService.GetJob(jobId);
+        Task job = wcfService.GetJob(jobId);
         if (job == null) throw new JobNotFoundException(jobId);
         jobManager.PauseJobAsync(jobId);
@@ -318 +319 @@
     private void RegisterJobManagerEvents() {
       this.jobManager.JobStarted += new EventHandler<EventArgs<SlaveJob>>(jobManager_JobStarted);
-      this.jobManager.JobPaused += new EventHandler<EventArgs<SlaveJob, JobData>>(jobManager_JobPaused);
-      this.jobManager.JobStopped += new EventHandler<EventArgs<SlaveJob, JobData>>(jobManager_JobStopped);
-      this.jobManager.JobFailed += new EventHandler<EventArgs<Tuple<SlaveJob, JobData, Exception>>>(jobManager_JobFailed);
+      this.jobManager.JobPaused += new EventHandler<EventArgs<SlaveJob, TaskData>>(jobManager_JobPaused);
+      this.jobManager.JobStopped += new EventHandler<EventArgs<SlaveJob, TaskData>>(jobManager_JobStopped);
+      this.jobManager.JobFailed += new EventHandler<EventArgs<Tuple<SlaveJob, TaskData, Exception>>>(jobManager_JobFailed);
       this.jobManager.ExceptionOccured += new EventHandler<EventArgs<SlaveJob, Exception>>(jobManager_ExceptionOccured);
       this.jobManager.JobAborted += new EventHandler<EventArgs<SlaveJob>>(jobManager_JobAborted);
@@ -329 +330 @@
     }
 
-    private void jobManager_JobPaused(object sender, EventArgs<SlaveJob, JobData> e) {
+    private void jobManager_JobPaused(object sender, EventArgs<SlaveJob, TaskData> e) {
       try {
         SlaveStatusInfo.DecrementUsedCores(e.Value.CoresNeeded);
         heartbeatManager.AwakeHeartBeatThread();
-        Job job = wcfService.GetJob(e.Value.JobId);
+        Task job = wcfService.GetJob(e.Value.JobId);
         if (job == null) throw new JobNotFoundException(e.Value.JobId);
         job.ExecutionTime = e.Value.ExecutionTime;
-        JobData jobData = e.Value.GetJobData();
-        wcfService.UpdateJobData(job, jobData, configManager.GetClientInfo().Id, JobState.Paused);
+        TaskData jobData = e.Value.GetJobData();
+        wcfService.UpdateJobData(job, jobData, configManager.GetClientInfo().Id, TaskState.Paused);
       }
       catch (JobNotFoundException ex) {
@@ -347 +348 @@
     }
 
-    private void jobManager_JobStopped(object sender, EventArgs<SlaveJob, JobData> e) {
+    private void jobManager_JobStopped(object sender, EventArgs<SlaveJob, TaskData> e) {
       try {
         SlaveStatusInfo.DecrementUsedCores(e.Value.CoresNeeded);
         heartbeatManager.AwakeHeartBeatThread();
-        Job job = wcfService.GetJob(e.Value.JobId);
+        Task job = wcfService.GetJob(e.Value.JobId);
         if (job == null) throw new JobNotFoundException(e.Value.JobId);
         job.ExecutionTime = e.Value.ExecutionTime;
-        JobData jobData = e.Value.GetJobData();
-        wcfService.UpdateJobData(job, jobData, configManager.GetClientInfo().Id, JobState.Finished);
+        TaskData jobData = e.Value.GetJobData();
+        wcfService.UpdateJobData(job, jobData, configManager.GetClientInfo().Id, TaskState.Finished);
       }
       catch (JobNotFoundException ex) {
@@ -365 +366 @@
     }
 
-    private void jobManager_JobFailed(object sender, EventArgs<Tuple<SlaveJob, JobData, Exception>> e) {
+    private void jobManager_JobFailed(object sender, EventArgs<Tuple<SlaveJob, TaskData, Exception>> e) {
       try {
         SlaveStatusInfo.DecrementUsedCores(e.Value.Item1.CoresNeeded);
         heartbeatManager.AwakeHeartBeatThread();
         SlaveJob slaveJob = e.Value.Item1;
-        JobData jobData = e.Value.Item2;
+        TaskData jobData = e.Value.Item2;
         Exception exception = e.Value.Item3;
 
-        Job job = wcfService.GetJob(slaveJob.JobId);
+        Task job = wcfService.GetJob(slaveJob.JobId);
         if (job == null) throw new JobNotFoundException(slaveJob.JobId);
         job.ExecutionTime = slaveJob.ExecutionTime;
         if (jobData != null) {
-          wcfService.UpdateJobData(job, jobData, configManager.GetClientInfo().Id, JobState.Failed, exception.ToString());
+          wcfService.UpdateJobData(job, jobData, configManager.GetClientInfo().Id, TaskState.Failed, exception.ToString());
         } else {
-          wcfService.UpdateJobState(job.Id, JobState.Failed, exception.ToString());
+          wcfService.UpdateJobState(job.Id, TaskState.Failed, exception.ToString());
         }
         clientCom.LogMessage(exception.Message);
@@ -398 +399 @@
       heartbeatManager.AwakeHeartBeatThread();
       clientCom.LogMessage(string.Format("Exception occured for job {0}: {1}", e.Value.JobId, e.Value2.ToString()));
-      wcfService.UpdateJobState(e.Value.JobId, JobState.Waiting, e.Value2.ToString());
+      wcfService.UpdateJobState(e.Value.JobId, TaskState.Waiting, e.Value2.ToString());
     }