Changeset 9661

Timestamp:

06/27/13 15:25:42 (12 years ago)

Author:

pfleck

Message:

#2063:
Updated wrong endpoint address.
Re-enabled performance counters for slaves.

Location:

branches/HiveStatistics/sources

Files:

• HeuristicLab.Clients.Access/3.3/app.config (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.3/Manager/ConfigManager.cs (modified) (4 diffs)

branches/HiveStatistics/sources/HeuristicLab.Clients.Access/3.3/app.config

@@ -29 +29 @@
         </bindings>
         <client>
-            <endpoint address="http://testhive.fh-hagenberg.at/Hive-3.3/HiveService.svc" binding="wsHttpBinding"
+            <endpoint address="http://testhive.fh-hagenberg.at/AccessService/AccessService.svc" binding="wsHttpBinding"
                 bindingConfiguration="WSHttpBinding_IAccessService" contract="HeuristicLab.Clients.Access.IAccessService"
                 name="WSHttpBinding_IAccessService">

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Manager/ConfigManager.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Management;
@@ -44 +45 @@
     private TaskManager jobManager;
     private Slave slave;
-    //private PerformanceCounter cpuCounter;
-    //private PerformanceCounter memCounter;
+    private PerformanceCounter cpuCounter;
+    private PerformanceCounter memCounter;
 
     /// <summary>
@@ -52 +53 @@
     public ConfigManager(TaskManager jobManager) {
       this.jobManager = jobManager;
-      /*cpuCounter = new PerformanceCounter();
+      cpuCounter = new PerformanceCounter();
       cpuCounter.CategoryName = "Processor";
       cpuCounter.CounterName = "% Processor Time";
-      cpuCounter.InstanceName = "_Total";*/
-      //memCounter = new PerformanceCounter("Memory", "Available Bytes", true);
+      cpuCounter.InstanceName = "_Total";
+      memCounter = new PerformanceCounter("Memory", "Available Bytes", true);
 
       Asleep = false;
@@ -255 +256 @@
     /// </summary>    
     public int GetFreeMemory() {
-      int mb = 0;
-
-      try {
-        //mb = (int)(memCounter.NextValue() / 1024 / 1024);
-        mb = 1024;
-      }
-      catch { }
-      return mb;
+      try {
+        return (int)(memCounter.NextValue() / 1024 / 1024);
+      }
+      catch {
+        return 0;
+      }
     }
 
     public float GetCpuUtilization() {
-      float cpuVal = 0.0F;
-      /*try {
+      try {
         return cpuCounter.NextValue();
       }
-      catch { }    */
-      return cpuVal;
+      catch {
+        return 0.0f;
+      }
     }
   }