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

Timestamp:

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

Author:

ascheibe

Message:

#1233 worked on slave and slave service installer

Location:

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

Files:

• Core.cs (modified) (5 diffs)
• HeartbeatManager.cs (modified) (6 diffs)
• HeuristicLab.Clients.Hive.Slave-3.4.csproj (modified) (1 diff)
• ICSharpCode.SharpZipLib License.txt (added)
• PluginCache.cs (modified) (1 diff)

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();
     }
 

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

@@ -34 +34 @@
     private Thread heartBeatThread;
     private AutoResetEvent waitHandle;
+    private WcfService wcfService;
+    private bool threadStopped;
+    ReaderWriterLockSlim heartBeatThreadIsSleepingLock = new ReaderWriterLockSlim();
 
     public HeartbeatManager() {
@@ -42 +45 @@
       Interval = interval;
     }
-
-    private WcfService wcfService;
-
-    private bool threadStopped;
-
-    ReaderWriterLockSlim heartBeatThreadIsSleepingLock = new ReaderWriterLockSlim();
 
     /// <summary>
@@ -78 +75 @@
 
     private void RunHeartBeatThread() {
+      bool sleepForever;
       while (!threadStopped) {
+        sleepForever = false;
         try {
           lock (locker) {
@@ -88 +87 @@
 
               Heartbeat heartBeatData = new Heartbeat {
-                SlaveId = info.Id, /*Settings.Default.Guid*/
+                SlaveId = info.Id,
                 FreeCores = info.Cores.HasValue ? info.Cores.Value - ConfigManager.Instance.GetUsedCores() : 0,
                 FreeMemory = ConfigManager.GetFreeMemory(),
@@ -102 +101 @@
                 OnExceptionOccured(new Exception("Error getting response from Heartbeat"));
               } else {
-                SlaveClientCom.Instance.ClientCom.LogMessage("Heartbeat Response received: ");
+                SlaveClientCom.Instance.ClientCom.LogMessage("Heartbeat Response received (" + msgs.Count + "): ");
                 msgs.ForEach(mc => SlaveClientCom.Instance.ClientCom.LogMessage(mc.Message.ToString()));
                 msgs.ForEach(mc => MessageQueue.GetInstance().AddMessage(mc));
+                //after fetching a job, we sleep until the core wakes us up!!
+                msgs.ForEach(s => { if (s.Message == MessageContainer.MessageType.CalculateJob) sleepForever = true; });
               }
             }
@@ -113 +114 @@
           OnExceptionOccured(e);
         }
-        waitHandle.WaitOne(this.Interval);
+        if (sleepForever)
+          waitHandle.WaitOne();
+        else
+          waitHandle.WaitOne(this.Interval);
       }
       waitHandle.Close();

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/HeuristicLab.Clients.Hive.Slave-3.4.csproj

@@ -146 +146 @@
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="ICSharpCode.SharpZipLib License.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

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

@@ -113 +113 @@
         CopyFile(baseDir, targetDir, "HeuristicLab.Hive-3.4.dll");
         CopyFile(baseDir, targetDir, "HeuristicLab.Clients.Common-3.3.dll");
-
-        //TODO: remove, just needed for unit tests
-        CopyFile(baseDir, targetDir, "HeuristicLab.Clients.Hive.Slave.Tests-3.4.dll");
       }
     }