Changeset 6721 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/HiveClient.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/3.3/HiveClient.cs (modified) (12 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

@@ -31 +31 @@
 using HeuristicLab.Core;
 using HeuristicLab.PluginInfrastructure;
+using TS = System.Threading.Tasks;
 
 namespace HeuristicLab.Clients.Hive {
@@ -217 +218 @@
       ServiceLocator.Instance.CallHiveService(service => {
         foreach (HiveJob job in refreshableHiveExperiment.GetAllHiveJobs()) {
-          if (job.Job.State != JobState.Finished && job.Job.State != JobState.Aborted && job.Job.State != JobState.Failed)
+          if (job.Job.State != TaskState.Finished && job.Job.State != TaskState.Aborted && job.Job.State != TaskState.Failed)
             service.PauseJob(job.Job.Id);
         }
@@ -227 +228 @@
       ServiceLocator.Instance.CallHiveService(service => {
         foreach (HiveJob job in refreshableHiveExperiment.GetAllHiveJobs()) {
-          if (job.Job.State != JobState.Finished && job.Job.State != JobState.Aborted && job.Job.State != JobState.Failed)
+          if (job.Job.State != TaskState.Finished && job.Job.State != TaskState.Aborted && job.Job.State != TaskState.Failed)
             service.StopJob(job.Job.Id);
         }
@@ -282 +283 @@
         refreshableHiveExperiment.Progress.Status = "Uploading jobs...";
 
-        var tasks = new List<Task>();
+        var tasks = new List<TS.Task>();
         foreach (HiveJob hiveJob in refreshableHiveExperiment.HiveJobs) {
-          tasks.Add(Task.Factory.StartNew((hj) => {
+          tasks.Add(TS.Task.Factory.StartNew((hj) => {
             UploadJobWithChildren(refreshableHiveExperiment.Progress, (HiveJob)hj, null, resourceIds, jobCount, totalJobCount, configFilePlugin.Id, refreshableHiveExperiment.HiveExperiment.Id, refreshableHiveExperiment.Log, refreshableHiveExperiment.HiveExperiment.IsPrivileged, cancellationToken);
           }, hiveJob)
@@ -290 +291 @@
         }
         try {
-          Task.WaitAll(tasks.ToArray());
+          TS.Task.WaitAll(tasks.ToArray());
         }
         catch (AggregateException ae) {
@@ -341 +342 @@
           jobCount[0]++;
         }
-        JobData jobData;
+        TaskData jobData;
         List<IPluginDescription> plugins;
 
@@ -384 +385 @@
         }
 
-        var tasks = new List<Task>();
+        var tasks = new List<TS.Task>();
         foreach (HiveJob child in hiveJob.ChildHiveJobs) {
-          tasks.Add(Task.Factory.StartNew((tuple) => {
+          tasks.Add(TS.Task.Factory.StartNew((tuple) => {
             var arguments = (Tuple<HiveJob, HiveJob>)tuple;
             UploadJobWithChildren(progress, arguments.Item1, arguments.Item2, groups, jobCount, totalJobCount, configPluginId, hiveExperimentId, log, isPrivileged, cancellationToken);
@@ -394 +395 @@
         jobUploadSemaphore.Release(); semaphoreReleased = true; // the semaphore has to be release before waitall!
         try {
-          Task.WaitAll(tasks.ToArray());
+          TS.Task.WaitAll(tasks.ToArray());
         }
         catch (AggregateException ae) {
@@ -414 +415 @@
         refreshableHiveExperiment.IsProgressing = true;
         int totalJobCount = 0;
-        IEnumerable<LightweightJob> allJobs;
+        IEnumerable<LightweightTask> allJobs;
 
         refreshableHiveExperiment.Progress.Status = "Connecting to Server...";
-        // fetch all Job objects to create the full tree of tree of HiveJob objects
+        // fetch all Task objects to create the full tree of tree of HiveJob objects
         refreshableHiveExperiment.Progress.Status = "Downloading list of jobs...";
         allJobs = ServiceLocator.Instance.CallHiveService(s => s.GetLightweightExperimentJobs(hiveExperiment.Id));
@@ -436 +437 @@
         IDictionary<Guid, HiveJob> allHiveJobs = downloader.Results;
 
-        refreshableHiveExperiment.HiveJobs = new ItemCollection<HiveJob>(allHiveJobs.Values.Where(x => !x.Job.ParentJobId.HasValue));
+        refreshableHiveExperiment.HiveJobs = new ItemCollection<HiveJob>(allHiveJobs.Values.Where(x => !x.Job.ParentTaskId.HasValue));
 
         if (refreshableHiveExperiment.IsFinished()) {
@@ -456 +457 @@
     }
 
-    private static void BuildHiveJobTree(HiveJob parentHiveJob, IEnumerable<LightweightJob> allJobs, IDictionary<Guid, HiveJob> allHiveJobs) {
-      IEnumerable<LightweightJob> childJobs = from job in allJobs
-                                              where job.ParentJobId.HasValue && job.ParentJobId.Value == parentHiveJob.Job.Id
-                                              orderby job.DateCreated ascending
-                                              select job;
-      foreach (LightweightJob job in childJobs) {
+    private static void BuildHiveJobTree(HiveJob parentHiveJob, IEnumerable<LightweightTask> allJobs, IDictionary<Guid, HiveJob> allHiveJobs) {
+      IEnumerable<LightweightTask> childJobs = from job in allJobs
+                                               where job.ParentTaskId.HasValue && job.ParentTaskId.Value == parentHiveJob.Job.Id
+                                               orderby job.DateCreated ascending
+                                               select job;
+      foreach (LightweightTask job in childJobs) {
         HiveJob childHiveJob = allHiveJobs[job.Id];
         parentHiveJob.AddChildHiveJob(childHiveJob);
@@ -481 +482 @@
 
     public static ItemJob LoadItemJob(Guid jobId) {
-      JobData jobData = ServiceLocator.Instance.CallHiveService(s => s.GetJobData(jobId));
+      TaskData jobData = ServiceLocator.Instance.CallHiveService(s => s.GetJobData(jobId));
       try {
         return PersistenceUtil.Deserialize<ItemJob>(jobData.Data);