Changeset 5721 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs

Timestamp:

03/16/11 18:05:56 (13 years ago)

Author:

ascheibe

Message:

#1233 worked on slave and slave service installer

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs (modified) (5 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs

@@ -26 +26 @@
 using System.ServiceModel;
 using System.Threading;
+using System.Threading.Tasks;
 using HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts;
 using HeuristicLab.Common;
@@ -133 +134 @@
     private void DetermineAction(MessageContainer container) {
       ClientCom.LogMessage("Message: " + container.Message.ToString() + " for job: " + container.JobId);
-      //TODO: find a better solution
+
       if (container is ExecutorMessageContainer<Guid>) {
         ExecutorMessageContainer<Guid> c = (ExecutorMessageContainer<Guid>)container;
@@ -140 +141 @@
         switch (container.Message) {
           case MessageContainer.MessageType.CalculateJob:
-            Job job = wcfService.GetJob(container.JobId);
-            JobData jobData = wcfService.GetJobData(job.Id);
-            job = wcfService.UpdateJobState(job.Id, JobState.Calculating, null);
-            StartJobInAppDomain(job, jobData);
+            Task.Factory.StartNew(() => {
+              Job job = wcfService.GetJob(container.JobId);
+              lock (engines) {
+                if (!jobs.ContainsKey(job.Id)) {
+                  jobs.Add(job.Id, job);
+                }
+              }
+              JobData jobData = wcfService.GetJobData(job.Id);
+              job = wcfService.UpdateJobState(job.Id, JobState.Calculating, null);
+              StartJobInAppDomain(job, jobData);
+            });
             break;
           case MessageContainer.MessageType.ShutdownSlave:
@@ -420 +428 @@
           appDomain.UnhandledException += new UnhandledExceptionEventHandler(AppDomain_UnhandledException);
           lock (engines) {
-            if (!jobs.ContainsKey(myJob.Id)) {
-              jobs.Add(myJob.Id, myJob);
-              appDomains.Add(myJob.Id, appDomain);
-              ClientCom.LogMessage("Creating AppDomain");
-              Executor engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
-              ClientCom.LogMessage("Created AppDomain");
-              engine.JobId = myJob.Id;
-              engine.Core = this;
-              ClientCom.LogMessage("Starting Engine for job " + myJob.Id);
-              engines.Add(myJob.Id, engine);
-              engine.Start(jobData.Data);
-              SlaveStatusInfo.JobsFetched++;
-              ClientCom.LogMessage("Increment FetchedJobs to:" + SlaveStatusInfo.JobsFetched);
-            }
+            appDomains.Add(myJob.Id, appDomain);
+            ClientCom.LogMessage("Creating AppDomain");
+            Executor engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
+            ClientCom.LogMessage("Created AppDomain");
+            engine.JobId = myJob.Id;
+            engine.Core = this;
+            ClientCom.LogMessage("Starting Engine for job " + myJob.Id);
+            engines.Add(myJob.Id, engine);
+            engine.Start(jobData.Data);
+            SlaveStatusInfo.JobsFetched++;
+            ClientCom.LogMessage("Increment FetchedJobs to:" + SlaveStatusInfo.JobsFetched);
           }
-          heartbeatManager.AwakeHeartBeatThread();
         }
         catch (Exception exception) {
@@ -443 +447 @@
         }
       }
+      heartbeatManager.AwakeHeartBeatThread();
     }