Changeset 1033

Timestamp:

12/18/08 16:41:10 (16 years ago)

Author:

kgrading

Message:

added locking to avoid race conditions (#440)

Location:

trunk/sources/HeuristicLab.Hive.Client.Core

Files:

• ClientConsoleService/ClientConsoleCommunicator.cs (modified) (1 diff)
• Core.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Hive.Client.Core/ClientConsoleService/ClientConsoleCommunicator.cs

@@ -12 +12 @@
 
     public StatusCommons GetStatusInfos() {
-      return ConfigManager.Instance.GetStatusForClientConsole();
+      lock (Core.Locker) {
+        return ConfigManager.Instance.GetStatusForClientConsole();
+      }
     }
 

trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

@@ -49 +49 @@
     public delegate string GetASnapshotDelegate();
 
+    public static Object Locker { get; set; }
+
     Dictionary<long, Executor> engines = new Dictionary<long, Executor>();
     Dictionary<long, AppDomain> appDomains = new Dictionary<long, AppDomain>();
@@ -149 +151 @@
 
         PluginManager.Manager.Initialize();
-        AppDomain appDomain =  PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, typeof(TestJob));
+        AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, typeof(TestJob));
         appDomain.UnhandledException += new UnhandledExceptionEventHandler(appDomain_UnhandledException);
-        if (!jobs.ContainsKey(e.Result.Job.Id)) {
-          jobs.Add(e.Result.Job.Id, e.Result.Job);
-          appDomains.Add(e.Result.Job.Id, appDomain);
-
-          Executor engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
-          engine.JobId = e.Result.Job.Id;
-          engine.Queue = MessageQueue.GetInstance();
-          engine.Start(e.Result.SerializedJob);
-          engines.Add(e.Result.Job.Id, engine);
-
-          ClientStatusInfo.JobsFetched++;
-
-          Debug.WriteLine("Increment FetchedJobs to:" + ClientStatusInfo.JobsFetched);
+        lock (Locker) {
+          if (!jobs.ContainsKey(e.Result.Job.Id)) {
+            jobs.Add(e.Result.Job.Id, e.Result.Job);
+            appDomains.Add(e.Result.Job.Id, appDomain);
+
+            Executor engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
+            engine.JobId = e.Result.Job.Id;
+            engine.Queue = MessageQueue.GetInstance();
+            engine.Start(e.Result.SerializedJob);
+            engines.Add(e.Result.Job.Id, engine);
+
+            ClientStatusInfo.JobsFetched++;
+
+            Debug.WriteLine("Increment FetchedJobs to:" + ClientStatusInfo.JobsFetched);
+          }
         }
       }
@@ -170 +174 @@
     void wcfService_SendJobResultCompleted(object sender, SendJobResultCompletedEventArgs e) {
       if (e.Result.Success) {
-        AppDomain.Unload(appDomains[e.Result.Job.Id]);
-        appDomains.Remove(e.Result.Job.Id);
-        engines.Remove(e.Result.Job.Id);
-        jobs.Remove(e.Result.Job.Id);
-        ClientStatusInfo.JobsProcessed++;
+        lock (Locker) {
+          AppDomain.Unload(appDomains[e.Result.Job.Id]);
+          appDomains.Remove(e.Result.Job.Id);
+          engines.Remove(e.Result.Job.Id);
+          jobs.Remove(e.Result.Job.Id);
+          ClientStatusInfo.JobsProcessed++;
+        }
         Debug.WriteLine("ProcessedJobs to:" + ClientStatusInfo.JobsProcessed);
       } else {