Changeset 8994

Timestamp:

12/04/12 14:30:58 (12 years ago)

Author:

ascheibe

Message:

#1950 added locking for assigning runs to the run collection view

Location:

trunk/sources

Files:

• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (5 diffs)
• HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

@@ -46 +46 @@
     private HiveResourceSelectorDialog hiveResourceSelectorDialog;
     private bool SuppressEvents { get; set; }
+    private object runCollectionViewLocker = new object();
 
     public new RefreshableJob Content {
@@ -132 +133 @@
           logView.Content = null;
           refreshAutomaticallyCheckBox.Checked = false;
-          runCollectionViewHost.Content = null;
+          lock (runCollectionViewLocker) {
+            runCollectionViewHost.Content = null;
+          }
         } else {
           nameTextBox.Text = Content.Job.Name;
@@ -140 +143 @@
           refreshAutomaticallyCheckBox.Checked = Content.RefreshAutomatically;
           logView.Content = Content.Log;
-          runCollectionViewHost.Content = GetAllRunsFromJob(Content);
+          lock (runCollectionViewLocker) {
+            runCollectionViewHost.Content = GetAllRunsFromJob(Content);
+          }
         }
       }
@@ -192 +197 @@
     #region Content Events
     void Content_TaskReceived(object sender, EventArgs e) {
-      runCollectionViewHost.Content = GetAllRunsFromJob(Content);
+      lock (runCollectionViewLocker) {
+        runCollectionViewHost.Content = GetAllRunsFromJob(Content);
+      }
     }
 
@@ -288 +295 @@
 
     void Content_Loaded(object sender, EventArgs e) {
-      runCollectionViewHost.Content = GetAllRunsFromJob(Content);
+      lock (runCollectionViewLocker) {
+        runCollectionViewHost.Content = GetAllRunsFromJob(Content);
+      }
     }
 

trunk/sources/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

@@ -302 +302 @@
               });
             }
-          } else
-            throw new Exception("This should not happen");
+          }
         }
         GC.Collect(); // force GC, because .NET is too lazy here (deserialization takes a lot of memory)