Changeset 1379 for trunk/sources/HeuristicLab.Hive.Client.Core/Heartbeat.cs

Timestamp:

03/20/09 13:56:55 (15 years ago)

Author:

kgrading

Message:

splitted the sendfinishedjob / snapshot method in two seperate methods, fixed the locking, added real memory management (#529)

File:

• trunk/sources/HeuristicLab.Hive.Client.Core/Heartbeat.cs (modified) (3 diffs)

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

@@ -61 +61 @@
       heartbeatTimer.Elapsed += new ElapsedEventHandler(heartbeatTimer_Elapsed);
       wcfService = WcfService.Instance;
-      wcfService.SendHeartBeatCompleted += new EventHandler<ProcessHeartBeatCompletedEventArgs>(wcfService_SendHeartBeatCompleted);
+      wcfService.SendHeartBeatCompleted += new EventHandler<ProcessHeartBeatCompletedEventArgs>(wcfService_ProcessHeartBeatCompleted);
       heartbeatTimer.Start();
     }
@@ -75 +75 @@
       // Todo: remove tempfix for free cores.
 
-      HeartBeatData heartBeatData = new HeartBeatData {
+      PerformanceCounter counter = new PerformanceCounter("Memory", "Available Bytes", true);
+      int mb = (int)(counter.NextValue() / 1024 / 1024);
+
+
+        HeartBeatData heartBeatData = new HeartBeatData {
         ClientId = info.ClientId,
         FreeCores = info.NrOfCores - (ClientStatusInfo.JobsFetched - ClientStatusInfo.JobsProcessed),
-        FreeMemory = 1000,
+        FreeMemory = mb,
         JobProgress = ConfigManager.Instance.GetProgressOfAllJobs()
       };
@@ -88 +92 @@
     }
 
-    void wcfService_SendHeartBeatCompleted(object sender, ProcessHeartBeatCompletedEventArgs e) {
+    void wcfService_ProcessHeartBeatCompleted(object sender, ProcessHeartBeatCompletedEventArgs e) {
       System.Diagnostics.Debug.WriteLine("Heartbeat received! ");
       e.Result.ActionRequest.ForEach(mc => MessageQueue.GetInstance().AddMessage(mc));