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

Timestamp:

01/11/11 17:29:40 (13 years ago)

Author:

ascheibe

Message:

#1233

• added a new project: SlaveWindowsService: runs the Hive Slave as a Windows Service
• some improvements when there is no server connection
• some fixes for the communication between slave and gui

File:

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

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

@@ -24 +24 @@
 using System.IO;
 using System.Runtime.CompilerServices;
+using System.ServiceModel;
 using System.Threading;
 using HeuristicLab.Clients.Hive.Slave;
@@ -39 +40 @@
   public class Core : MarshalByRefObject {
     public static bool abortRequested { get; set; }
+    private Semaphore waitShutdownSem = new Semaphore(0, 1);
     public static ILog Log { get; set; }
 
@@ -50 +52 @@
 
     private ISlaveCommunication ClientCom;
+    private ServiceHost slaveComm;
 
     public Dictionary<Guid, Executor> ExecutionEngines {
@@ -60 +63 @@
 
     public Core() {
+    }
+
+    /// <summary>
+    /// Main Method for the client
+    /// </summary>
+    public void Start() {
       coreThreadId = Thread.CurrentThread.ManagedThreadId;
-    }
-
-    /// <summary>
-    /// Main Method for the client
-    /// </summary>
-    public void Start() {
       abortRequested = false;
+
+      //start the client communication service (pipe between slave and slave gui)
+      slaveComm = new ServiceHost(typeof(SlaveCommunicationService));
+      slaveComm.Open();
 
       ClientCom = SlaveClientCom.Instance.ClientCom;
@@ -82 +89 @@
 
       DeRegisterServiceEvents();
+      waitShutdownSem.Release();
     }
 
@@ -110 +118 @@
     void wcfService_ExceptionOccured(object sender, EventArgs<Exception> e) {
       ClientCom.LogMessage("Connection to server interruped with exception: " + e.Value.Message);
-      ShutdownCore();
     }
 
@@ -159 +166 @@
     }
 
-    public void ShutdownCore() {
+    public void Shutdown() {
+      MessageContainer mc = new MessageContainer(MessageContainer.MessageType.ShutdownSlave);
+      MessageQueue.GetInstance().AddMessage(mc);
+      waitShutdownSem.WaitOne();
+    }
+
+    private void ShutdownCore() {
       ClientCom.LogMessage("Shutdown Signal received");
       ClientCom.LogMessage("Stopping heartbeat");
@@ -165 +178 @@
       abortRequested = true;
       ClientCom.LogMessage("Logging out");
+
 
       lock (engines) {
@@ -177 +191 @@
       ClientCom.Shutdown();
       SlaveClientCom.Close();
+
+      if (slaveComm.State != CommunicationState.Closed)
+        slaveComm.Close();
     }