Changeset 6381 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveJobs/HiveJob.cs

Timestamp:

06/08/11 00:04:16 (13 years ago)

Author:

cneumuel

Message:

#1233

• locking for childHiveJobs in OptimizerHiveJob avoid multi threaded access issues
• added IsPrivileged to gui
• minor changes

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveJobs/HiveJob.cs (modified) (12 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveJobs/HiveJob.cs

@@ -25 +25 @@
 using System.Drawing;
 using System.Linq;
+using System.Threading;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
@@ -37 +38 @@
   public class HiveJob : NamedItem, IItemTree<HiveJob> {
     protected static object locker = new object();
+    protected ReaderWriterLockSlim childHiveJobsLock = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
 
     public override Image ItemImage {
@@ -109 +111 @@
     protected ItemList<HiveJob> childHiveJobs;
     public virtual ReadOnlyItemList<HiveJob> ChildHiveJobs {
-      get { return childHiveJobs.AsReadOnly(); }
+      get {
+        childHiveJobsLock.EnterReadLock();
+        try {
+          return childHiveJobs.AsReadOnly();
+        }
+        finally { childHiveJobsLock.ExitReadLock(); }
+      }
     }
 
@@ -117 +125 @@
     #region Constructors and Cloning
     public HiveJob() {
-      this.Job = new Job() {
-        CoresNeeded = 1,
-        MemoryNeeded = 0
-      };
+      this.Job = new Job() { CoresNeeded = 1, MemoryNeeded = 0 };
       job.State = JobState.Offline;
       this.childHiveJobs = new ItemList<HiveJob>();
@@ -152 +157 @@
       this.Job = cloner.Clone(original.job);
       this.ItemJob = cloner.Clone(original.ItemJob);
-      this.childHiveJobs = cloner.Clone(original.childHiveJobs);
+      original.childHiveJobsLock.EnterReadLock();
+      try {
+        this.childHiveJobs = cloner.Clone(original.childHiveJobs);
+      }
+      finally { original.childHiveJobsLock.ExitReadLock(); }
       this.syncJobsWithOptimizers = original.syncJobsWithOptimizers;
       this.isFinishedJobDownloaded = original.isFinishedJobDownloaded;
@@ -198 +207 @@
 
     public virtual void AddChildHiveJob(HiveJob hiveJob) {
-      this.childHiveJobs.Add(hiveJob);
+      childHiveJobsLock.EnterWriteLock();
+      try {
+        this.childHiveJobs.Add(hiveJob);
+      }
+      finally { childHiveJobsLock.ExitWriteLock(); }
     }
 
@@ -237 +250 @@
       IEnumerable<Type> usedTypes;
       byte[] jobByteArray = PersistenceUtil.Serialize(this.ItemJob, out usedTypes);
-
-      JobData jobData = new JobData() {
-        JobId = job.Id,
-        Data = jobByteArray
-      };
-
+      JobData jobData = new JobData() { JobId = job.Id, Data = jobByteArray };
       PluginUtil.CollectDeclaringPlugins(plugins, usedTypes);
-
       return jobData;
     }
@@ -295 +302 @@
     /// </summary>
     public IEnumerable<HiveJob> GetAllHiveJobs() {
-      var jobs = new List<HiveJob>();
-      jobs.Add(this);
-      foreach (HiveJob child in this.ChildHiveJobs) {
-        jobs.AddRange(child.GetAllHiveJobs());
-      }
-      return jobs;
+      childHiveJobsLock.EnterReadLock();
+      try {
+        var jobs = new List<HiveJob>();
+        jobs.Add(this);
+        foreach (HiveJob child in this.childHiveJobs) {
+          jobs.AddRange(child.GetAllHiveJobs());
+        }
+        return jobs;
+      }
+      finally { childHiveJobsLock.ExitReadLock(); }
     }
 
     public HiveJob GetParentByJobId(Guid jobId) {
-      if (this.ChildHiveJobs.SingleOrDefault(j => j.job.Id == jobId) != null)
-        return this;
-      foreach (HiveJob child in this.childHiveJobs) {
-        HiveJob result = child.GetParentByJobId(jobId);
-        if (result != null)
-          return result;
-      }
-      return null;
+      childHiveJobsLock.EnterReadLock();
+      try {
+        if (this.ChildHiveJobs.SingleOrDefault(j => j.job.Id == jobId) != null)
+          return this;
+        foreach (HiveJob child in this.childHiveJobs) {
+          HiveJob result = child.GetParentByJobId(jobId);
+          if (result != null)
+            return result;
+        }
+        return null;
+      }
+      finally { childHiveJobsLock.ExitWriteLock(); }
     }
 
@@ -321 +336 @@
         return this;
       } else {
-        foreach (HiveJob child in this.ChildHiveJobs) {
-          HiveJob result = child.GetHiveJobByJobId(jobId);
-          if (result != null)
-            return result;
-        }
+        childHiveJobsLock.EnterReadLock();
+        try {
+          foreach (HiveJob child in this.childHiveJobs) {
+            HiveJob result = child.GetHiveJobByJobId(jobId);
+            if (result != null)
+              return result;
+          }
+        }
+        finally { childHiveJobsLock.ExitReadLock(); }
       }
       return null;
@@ -331 +350 @@
 
     public void RemoveByJobId(Guid jobId) {
-      IEnumerable<HiveJob> jobs = ChildHiveJobs.Where(j => j.Job.Id == jobId).ToList(); // if Guid.Empty needs to be removed, there could be more than one with this jobId
-      foreach (HiveJob j in jobs) {
-        this.childHiveJobs.Remove(j);
-      }
-      foreach (HiveJob child in ChildHiveJobs) {
-        child.RemoveByJobId(jobId);
-      }
+      childHiveJobsLock.EnterWriteLock();
+      try {
+        IEnumerable<HiveJob> jobs = childHiveJobs.Where(j => j.Job.Id == jobId).ToList();
+        foreach (HiveJob j in jobs) {
+          this.childHiveJobs.Remove(j);
+        }
+        foreach (HiveJob child in childHiveJobs) {
+          child.RemoveByJobId(jobId);
+        }
+      }
+      finally { childHiveJobsLock.ExitWriteLock(); }
     }
 
     public IEnumerable<IItemTree<HiveJob>> GetChildItems() {
-      return this.childHiveJobs;
+      return this.ChildHiveJobs;
     }
 
@@ -371 +394 @@
     public void Pause() {
       if (this.Job.IsParentJob) {
-        foreach (var child in ChildHiveJobs) {
-          ServiceLocator.Instance.CallHiveService(s => s.PauseJob(child.job.Id));
-        }
+        childHiveJobsLock.EnterReadLock();
+        try {
+          foreach (var child in childHiveJobs) {
+            ServiceLocator.Instance.CallHiveService(s => s.PauseJob(child.job.Id));
+          }
+        }
+        finally { childHiveJobsLock.ExitReadLock(); }
       } else {
         ServiceLocator.Instance.CallHiveService(s => s.PauseJob(this.job.Id));
@@ -381 +408 @@
     public void Stop() {
       if (this.Job.IsParentJob) {
-        foreach (var child in ChildHiveJobs) {
-          ServiceLocator.Instance.CallHiveService(s => s.StopJob(child.job.Id));
-        }
+        childHiveJobsLock.EnterReadLock();
+        try {
+          foreach (var child in childHiveJobs) {
+            ServiceLocator.Instance.CallHiveService(s => s.StopJob(child.job.Id));
+          }
+        }
+        finally { childHiveJobsLock.ExitReadLock(); }
       } else {
         ServiceLocator.Instance.CallHiveService(s => s.StopJob(this.job.Id));