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

Timestamp:

12/20/10 19:58:01 (14 years ago)

Author:

ascheibe

Message:

#1233

• more tests for the hive slave
• implemented a better way to write tests for the slave
• get rid of MessageTypes for core and executor
• various improvements in core and executor (better communication, bugfixes,...)

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.Slave/3.4/HeartbeatManager.cs (modified) (7 diffs)

branches/HeuristicLab.Hive-3.4/sources

@@ +1 @@
+*.suo
 HeuristicLab.Hive-3.4.suo
 TestResults
-HeuristicLab.Hive 3.4.suo

@@ +1 @@
+*.suo
 HeuristicLab.Hive-3.4.suo
 TestResults
-HeuristicLab.Hive 3.4.suo

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

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
 using HeuristicLab.Common;
-using HeuristicLab.Clients.Hive.Salve;
+using HeuristicLab.Services.Hive.Common;
 using HeuristicLab.Services.Hive.Common.DataTransfer;
-using HeuristicLab.Services.Hive.Common;
-using System.Collections.Generic;
 
 namespace HeuristicLab.Clients.Hive.Salve {
@@ -49 +48 @@
     private WcfService wcfService;
 
-    private bool abortThreadPending;
+    private bool threadStopped;
 
     ReaderWriterLockSlim heartBeatThreadIsSleepingLock = new ReaderWriterLockSlim();
-    
+
     /// <summary>
     /// Starts the Heartbeat signal.
@@ -58 +57 @@
     public void StartHeartbeat() {
       this.waitHandle = new AutoResetEvent(true);
-      wcfService = WcfService.Instance;     
-      abortThreadPending = false;
+      wcfService = WcfService.Instance;
+      threadStopped = false;
       heartBeatThread = new Thread(RunHeartBeatThread);
       heartBeatThread.Start();
@@ -68 +67 @@
     /// </summary>
     public void StopHeartBeat() {
-      abortThreadPending = true;
+      threadStopped = true;
       waitHandle.Set();
       heartBeatThread.Join();
     }
-    
+
     /// <summary>
     /// use this method to singalize there is work to do (to avoid the waiting period if its clear that actions are required)
     /// </summary>
     public void AwakeHeartBeatThread() {
-      waitHandle.Set();
+      if (!threadStopped)
+        waitHandle.Set();
     }
 
     private void RunHeartBeatThread() {
-      while (!abortThreadPending) {
+      while (!threadStopped) {
         try {
           lock (locker) {
@@ -87 +87 @@
               wcfService.Connect(ConfigManager.Instance.GetClientInfo()); // Login happens automatically upon successfull connection
             }
-            if(wcfService.ConnState == NetworkEnum.WcfConnState.Connected) {
+            if (wcfService.ConnState == NetworkEnum.WcfConnState.Connected) {
               HeuristicLab.Services.Hive.Common.DataTransfer.Slave info = ConfigManager.Instance.GetClientInfo();
 
-              Heartbeat heartBeatData = new Heartbeat
-              {
+              Heartbeat heartBeatData = new Heartbeat {
                 SlaveId = info.Id,
                 FreeCores = info.Cores.HasValue ? info.Cores.Value - ConfigManager.Instance.GetUsedCores() : 0,
                 FreeMemory = GetFreeMemory(),
-                JobProgress = ConfigManager.Instance.GetExecutionTimeOfAllJobs()                
+                JobProgress = ConfigManager.Instance.GetExecutionTimeOfAllJobs()
               };
-                              
+
               Logger.Debug("Sending Heartbeat: " + heartBeatData);
-              List<MessageContainer> msgs =  wcfService.SendHeartbeat(heartBeatData);
-              
+              List<MessageContainer> msgs = wcfService.SendHeartbeat(heartBeatData);
+
               if (msgs == null) {
                 Logger.Debug("Error getting response from Heartbeat");
@@ -108 +107 @@
               Logger.Debug("Heartbeat Response received: ");
               msgs.ForEach(mc => Logger.Debug(mc.Message.ToString()));
-              msgs.ForEach(mc => MessageQueue.GetInstance().AddMessage(mc));      
+              msgs.ForEach(mc => MessageQueue.GetInstance().AddMessage(mc));
             }
-          } // lock
+          }
         }
         catch (Exception e) {
@@ -117 +116 @@
         }
         waitHandle.WaitOne(this.Interval);
-      } // while
+      }
       waitHandle.Close();
-      abortThreadPending = false;
       Logger.Debug("Heartbeat thread stopped");
     }
-         
+
 
     #region Eventhandler

@@ +1 @@
+*.suo
 HeuristicLab.Hive-3.4.suo
 TestResults
-HeuristicLab.Hive 3.4.suo