Changeset 9363 for branches/OaaS/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

Timestamp:

04/16/13 13:13:41 (12 years ago)

Author:

spimming

Message:

#1888:

• Merged revisions from trunk

Location:

branches/OaaS

Files:

• . (modified) (2 props)
• HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs (modified) (14 diffs)

branches/OaaS

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

branches/OaaS/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

@@ -31 +31 @@
 
 namespace HeuristicLab.Clients.Hive {
-  public class RefreshableJob : IHiveItem, IDeepCloneable, IContent, IComparable<RefreshableJob> {
+  public class RefreshableJob : IHiveItem, IDeepCloneable, IContent, IComparable<RefreshableJob>, IDisposable {
     private JobResultPoller jobResultPoller;
     private ConcurrentTaskDownloader<ItemTask> jobDownloader;
-    private static object locker = new object();
+    private object locker = new object();
+    private object downloadFinishedLocker = new object();
+    object jobResultReceivedLocker = new object();
 
     public bool IsProgressing { get; set; }
@@ -46 +48 @@
             throw new ArgumentNullException();
 
-          if (job != null) DergisterJobEvents();
+          if (job != null) DeregisterJobEvents();
           job = value;
           if (job != null) {
@@ -64 +66 @@
       set {
         if (hiveTasks != value) {
-          if (hiveTasks != null) DeregisterHiveJobsEvents();
+          if (hiveTasks != null) DeregisterHiveTasksEvents();
           hiveTasks = value;
-          if (hiveTasks != null) RegisterHiveJobsEvents();
+          if (hiveTasks != null) RegisterHiveTasksEvents();
           OnHiveTasksChanged();
         }
@@ -156 +158 @@
 
     // may execute jobs with privileged permissions on slaves
-    private bool isAllowedPrivileged = true;
     public bool IsAllowedPrivileged {
-      get { return isAllowedPrivileged; }
+      get { return Job.IsPrivileged; }
       set {
-        if (value != isAllowedPrivileged) {
-          isAllowedPrivileged = value;
+        if (value != Job.IsPrivileged) {
+          Job.IsPrivileged = value;
           OnIsAllowedPrivilegedChanged();
         }
@@ -188 +189 @@
     #region Constructors and Cloning
     public RefreshableJob() {
-      this.refreshAutomatically = true;
+      this.refreshAutomatically = false;
       this.Job = new Job();
       this.log = new ThreadSafeLog();
@@ -228 +229 @@
         jobResultPoller = new JobResultPoller(job.Id, Settings.Default.ResultPollingInterval);
         RegisterResultPollingEvents();
-        jobResultPoller.AutoResumeOnException = true;
+        jobResultPoller.AutoResumeOnException = false;
       }
 
@@ -239 +240 @@
       if (jobResultPoller != null && jobResultPoller.IsPolling) {
         jobResultPoller.Stop();
+        DeregisterResultPollingEvents();
       }
     }
@@ -258 +260 @@
       }
     }
+
     private void jobResultPoller_JobResultReceived(object sender, EventArgs<IEnumerable<LightweightTask>> e) {
-      foreach (LightweightTask lightweightTask in e.Value) {
-        HiveTask hiveTask = GetHiveTaskById(lightweightTask.Id);
-        if (hiveTask != null) {
-          // lastJobDataUpdate equals DateTime.MinValue right after it was uploaded. When the first results are polled, this value is updated
-          if (hiveTask.Task.State == TaskState.Offline && lightweightTask.State != TaskState.Finished && lightweightTask.State != TaskState.Failed && lightweightTask.State != TaskState.Aborted) {
-            hiveTask.Task.LastTaskDataUpdate = lightweightTask.LastTaskDataUpdate;
-          }
-
-          hiveTask.UpdateFromLightweightJob(lightweightTask);
-
-          if (!hiveTask.IsFinishedTaskDownloaded && !hiveTask.IsDownloading && hiveTask.Task.LastTaskDataUpdate < lightweightTask.LastTaskDataUpdate) {
-            log.LogMessage(string.Format("Downloading task {0}", lightweightTask.Id));
-            hiveTask.IsDownloading = true;
-            jobDownloader.DownloadTaskData(hiveTask.Task, (localJob, itemJob) => {
-              log.LogMessage(string.Format("Finished downloading task {0}", localJob.Id));
-              HiveTask localHiveTask = GetHiveTaskById(localJob.Id);
-
-              if (itemJob == null) {
-                localHiveTask.IsDownloading = false;
-              }
-
-              if (itemJob == null) {
-                // something bad happened to this task. bad task, BAAAD task!
-              } else {
-                // if the task is paused, download but don't integrate into parent optimizer (to avoid Prepare)
-
-                if (localJob.State == TaskState.Paused) {
-                  localHiveTask.ItemTask = itemJob;
-                } else {
-                  if (localJob.ParentTaskId.HasValue) {
-                    HiveTask parentHiveTask = GetHiveTaskById(localJob.ParentTaskId.Value);
-                    parentHiveTask.IntegrateChild(itemJob, localJob.Id);
+      lock (jobResultReceivedLocker) {
+        foreach (LightweightTask lightweightTask in e.Value) {
+          HiveTask hiveTask = GetHiveTaskById(lightweightTask.Id);
+          if (hiveTask != null) {
+            // lastJobDataUpdate equals DateTime.MinValue right after it was uploaded. When the first results are polled, this value is updated
+            if (hiveTask.Task.State == TaskState.Offline && lightweightTask.State == TaskState.Waiting) {
+              hiveTask.Task.LastTaskDataUpdate = lightweightTask.LastTaskDataUpdate;
+            }
+
+            hiveTask.UpdateFromLightweightJob(lightweightTask);
+
+            if (!hiveTask.IsFinishedTaskDownloaded && !hiveTask.IsDownloading && hiveTask.Task.LastTaskDataUpdate < lightweightTask.LastTaskDataUpdate && (lightweightTask.State == TaskState.Finished || lightweightTask.State == TaskState.Aborted || lightweightTask.State == TaskState.Failed || lightweightTask.State == TaskState.Paused)) {
+              log.LogMessage(string.Format("Downloading task {0}", lightweightTask.Id));
+              hiveTask.IsDownloading = true;
+              jobDownloader.DownloadTaskData(hiveTask.Task, (localJob, itemJob) => {
+                lock (downloadFinishedLocker) {
+                  log.LogMessage(string.Format("Finished downloading task {0}", localJob.Id));
+                  HiveTask localHiveTask = GetHiveTaskById(localJob.Id);
+
+                  if (itemJob == null) {
+                    // something bad happened to this task. bad task, BAAAD task!
+                    localHiveTask.IsDownloading = false;
                   } else {
-                    localHiveTask.ItemTask = itemJob;
+                    // if the task is paused, download but don't integrate into parent optimizer (to avoid Prepare) 
+                    if (localJob.State == TaskState.Paused) {
+                      localHiveTask.ItemTask = itemJob;
+                    } else {
+                      if (localJob.ParentTaskId.HasValue) {
+                        HiveTask parentHiveTask = GetHiveTaskById(localJob.ParentTaskId.Value);
+                        parentHiveTask.IntegrateChild(itemJob, localJob.Id);
+                      } else {
+                        localHiveTask.ItemTask = itemJob;
+                      }
+                    }
+                    localHiveTask.IsDownloading = false;
+                    localHiveTask.Task.LastTaskDataUpdate = lightweightTask.LastTaskDataUpdate;
                   }
                 }
-                localHiveTask.IsDownloading = false;
-                localHiveTask.Task.LastTaskDataUpdate = localJob.LastTaskDataUpdate;
-              }
-            });
+              });
+            }
           }
         }
-      }
-      GC.Collect(); // force GC, because .NET is too lazy here (deserialization takes a lot of memory)
-      if (AllJobsFinished()) {
-        this.ExecutionState = Core.ExecutionState.Stopped;
-        StopResultPolling();
-      }
-      UpdateTotalExecutionTime();
-      UpdateStatistics();
-      OnStateLogListChanged();
-      OnTaskReceived();
+        GC.Collect(); // force GC, because .NET is too lazy here (deserialization takes a lot of memory)
+        if (AllJobsFinished()) {
+          this.ExecutionState = Core.ExecutionState.Stopped;
+          StopResultPolling();
+        }
+        UpdateTotalExecutionTime();
+        UpdateStatistics();
+        OnStateLogListChanged();
+        OnTaskReceived();
+      }
     }
 
@@ -334 +337 @@
                                                    || j.Task.State == TaskState.Aborted
                                                    || j.Task.State == TaskState.Failed)
-                                                   && j.IsFinishedTaskDownloaded);
+                                                   && !j.IsDownloading);
     }
 
@@ -356 +359 @@
     }
 
-    private void DergisterJobEvents() {
+    private void DeregisterJobEvents() {
       job.ToStringChanged -= new EventHandler(OnToStringChanged);
       job.PropertyChanged -= new PropertyChangedEventHandler(job_PropertyChanged);
@@ -471 +474 @@
 
     #region HiveTasks Events
-    private void RegisterHiveJobsEvents() {
+    private void RegisterHiveTasksEvents() {
       this.hiveTasks.ItemsAdded += new CollectionItemsChangedEventHandler<HiveTask>(hivetasks_ItemsAdded);
       this.hiveTasks.ItemsRemoved += new CollectionItemsChangedEventHandler<HiveTask>(hiveTasks_ItemsRemoved);
@@ -477 +480 @@
     }
 
-    private void DeregisterHiveJobsEvents() {
+    private void DeregisterHiveTasksEvents() {
       this.hiveTasks.ItemsAdded -= new CollectionItemsChangedEventHandler<HiveTask>(hivetasks_ItemsAdded);
       this.hiveTasks.ItemsRemoved -= new CollectionItemsChangedEventHandler<HiveTask>(hiveTasks_ItemsRemoved);
@@ -559 +562 @@
 
     public Guid Id {
-      get { return job.Id; }
+      get {
+        if (job == null) return Guid.Empty;
+        return job.Id;
+      }
       set { job.Id = value; }
     }
@@ -603 +609 @@
       return this.ToString().CompareTo(other.ToString());
     }
+
+    public void Unload() {
+      // stop result polling
+      if (refreshAutomatically)
+        RefreshAutomatically = false;
+      DisposeTasks();
+      hiveTasks = new ItemCollection<HiveTask>();
+    }
+
+    #region IDisposable Members
+    public void Dispose() {
+      if (jobDownloader != null) {
+        jobDownloader.ExceptionOccured -= new EventHandler<EventArgs<Exception>>(jobDownloader_ExceptionOccured);
+        jobDownloader.Dispose();
+        jobDownloader = null;
+      }
+      if (jobResultPoller != null) {
+        DeregisterResultPollingEvents();
+        jobResultPoller = null;
+      }
+      if (hiveTasks != null) {
+        DisposeTasks();
+      }
+      if (job != null) {
+        DeregisterJobEvents();
+        job = null;
+      }
+    }
+
+    private void DisposeTasks() {
+      DeregisterHiveTasksEvents();
+      foreach (var task in hiveTasks) {
+        task.Dispose();
+      }
+      hiveTasks.Clear(); // this should remove the item_StateLogChanged event handlers
+      hiveTasks = null;
+    }
+    #endregion
   }
 }

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages