Changeset 7213 for branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive/3.3/HiveJobs/HiveTask.cs

Timestamp:

12/20/11 11:45:18 (13 years ago)

Author:

gkronber

Message:

#1081 merged r7103:7209 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.3/HiveJobs/HiveTask.cs (modified) (9 diffs)

branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive/3.3/HiveJobs/HiveTask.cs

@@ -40 +40 @@
     protected ReaderWriterLockSlim childHiveTasksLock = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
 
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
+    }
     public override Image ItemImage {
       get {
@@ -52 +55 @@
           else if (task.State == TaskState.Failed) return HeuristicLab.Common.Resources.VSImageLibrary.Error;
           else if (task.State == TaskState.Finished) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
-          else return HeuristicLab.Common.Resources.VSImageLibrary.Event;
+          else return base.ItemImage;
         }
       }
@@ -71 +74 @@
           OnItemImageChanged();
         }
-
       }
     }
@@ -145 +147 @@
 
     public StateLogList StateLog {
-      get { return new StateLogList(this.task.StateLog); }
+      get {
+        var list = new StateLogList(this.task.StateLog);
+        list.ForEach(s => { s.TaskName = itemTask.Name; });
+        return list;
+      }
     }
 
@@ -157 +163 @@
 
     public HiveTask() {
-      this.Task = new Task() { CoresNeeded = 1, MemoryNeeded = 0 };
+      this.Task = new Task() { CoresNeeded = 1, MemoryNeeded = 128 };
       task.State = TaskState.Offline;
       this.childHiveTasks = new ItemList<HiveTask>();
@@ -238 +244 @@
     }
 
-    public virtual void AddChildHiveJob(HiveTask hiveJob) {
+    public virtual void AddChildHiveTask(HiveTask hiveTask) {
       childHiveTasksLock.EnterWriteLock();
       try {
-        this.childHiveTasks.Add(hiveJob);
+        this.childHiveTasks.Add(hiveTask);
       }
       finally { childHiveTasksLock.ExitWriteLock(); }
@@ -339 +345 @@
       if (e.PropertyName == "State") {
         IsFinishedTaskDownloaded = false;
+      }
+      if (e.PropertyName == "Priority" && Task != null) {
+        foreach (var task in childHiveTasks) {
+          task.Task.Priority = Task.Priority;
+        }
       }
     }
@@ -456 +467 @@
         try {
           foreach (var child in childHiveTasks) {
-            ServiceLocator.Instance.CallHiveService(s => s.PauseTask(child.task.Id));
+            HiveServiceLocator.Instance.CallHiveService(s => s.PauseTask(child.task.Id));
           }
         }
         finally { childHiveTasksLock.ExitReadLock(); }
       } else {
-        ServiceLocator.Instance.CallHiveService(s => s.PauseTask(this.task.Id));
+        HiveServiceLocator.Instance.CallHiveService(s => s.PauseTask(this.task.Id));
       }
     }
@@ -470 +481 @@
         try {
           foreach (var child in childHiveTasks) {
-            ServiceLocator.Instance.CallHiveService(s => s.StopTask(child.task.Id));
+            HiveServiceLocator.Instance.CallHiveService(s => s.StopTask(child.task.Id));
           }
         }
         finally { childHiveTasksLock.ExitReadLock(); }
       } else {
-        ServiceLocator.Instance.CallHiveService(s => s.StopTask(this.task.Id));
+        HiveServiceLocator.Instance.CallHiveService(s => s.StopTask(this.task.Id));
       }
     }
 
     public void Restart() {
-      ServiceLocator.Instance.CallHiveService(service => {
+      HiveServiceLocator.Instance.CallHiveService(service => {
         TaskData taskData = new TaskData();
         taskData.TaskId = this.task.Id;