Changeset 6910

Timestamp:

10/12/11 15:48:53 (13 years ago)

Author:

ascheibe

Message:

#1233 fixed a bug where the slave didn't report the cpu utilization correctly

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.3/Core.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.3/Manager/ConfigManager.cs (modified) (5 diffs)
• HeuristicLab.Clients.Hive.Slave/3.3/Manager/HeartbeatManager.cs (modified) (1 diff)

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

@@ -40 +40 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <OutputPath>..\..\..\..\..\trunk\sources\bin\</OutputPath>
+    <OutputPath>bin\Debug\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
@@ -65 +65 @@
       <Project>{989FE92B-484E-41EE-87E2-6A24AF0381D8}</Project>
       <Name>HeuristicLab.Clients.Hive.Slave-3.3</Name>
-      <Private>False</Private>
+      <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Clients.Hive\3.3\HeuristicLab.Clients.Hive-3.3.csproj">
       <Project>{B5EF1E5A-9F3D-40B9-B4B0-30AADF2E2CEB}</Project>
       <Name>HeuristicLab.Clients.Hive-3.3</Name>
-      <Private>False</Private>
+      <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Hive\3.3\HeuristicLab.Hive-3.3.csproj">
       <Project>{F98A1740-9AC9-4D36-A582-6A2D0D06978D}</Project>
       <Name>HeuristicLab.Hive-3.3</Name>
-      <Private>False</Private>
+      <Private>True</Private>
     </ProjectReference>
   </ItemGroup>

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

@@ -241 +241 @@
         if (task == null) throw new TaskNotFoundException(taskId);
         if (ConfigManager.Instance.GetFreeCores() < task.CoresNeeded) throw new OutOfCoresException();
-        if (ConfigManager.GetFreeMemory() < task.MemoryNeeded) throw new OutOfMemoryException();
+        if (ConfigManager.Instance.GetFreeMemory() < task.MemoryNeeded) throw new OutOfMemoryException();
         SlaveStatusInfo.IncrementUsedCores(task.CoresNeeded); usedCores = task.CoresNeeded;
         TaskData taskData = wcfService.GetTaskData(taskId);

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

@@ -46 +46 @@
     private Slave slave;
     private PerformanceCounter cpuCounter;
+    private PerformanceCounter memCounter;
 
     /// <summary>
@@ -52 +53 @@
     public ConfigManager(TaskManager jobManager) {
       this.jobManager = jobManager;
-      UpdateSlaveInfo();
-    }
-
-    private void UpdateSlaveInfo() {
       cpuCounter = new PerformanceCounter();
       cpuCounter.CategoryName = "Processor";
       cpuCounter.CounterName = "% Processor Time";
       cpuCounter.InstanceName = "_Total";
+      memCounter = new PerformanceCounter("Memory", "Available Bytes", true);
 
       Asleep = false;
@@ -70 +68 @@
       slave.OperatingSystem = Environment.OSVersion.VersionString;
       slave.CpuSpeed = GetCpuSpeed();
-      slave.FreeMemory = GetFreeMemory();
-      slave.HbInterval = (int)Settings.Default.HeartbeatInterval.TotalSeconds;
+
+      UpdateSlaveInfo();
+    }
+
+    private void UpdateSlaveInfo() {
+      if (slave != null) {
+        slave.FreeMemory = GetFreeMemory();
+        slave.HbInterval = (int)Settings.Default.HeartbeatInterval.TotalSeconds;
+      }
     }
 
@@ -240 +245 @@
     /// returns free memory of machine in MB
     /// </summary>    
-    public static int GetFreeMemory() {
+    public int GetFreeMemory() {
       int mb = 0;
 
       try {
-        PerformanceCounter counter = new PerformanceCounter("Memory", "Available Bytes", true);
-        mb = (int)(counter.NextValue() / 1024 / 1024);
+        mb = (int)(memCounter.NextValue() / 1024 / 1024);
       }
       catch { }
@@ -252 +256 @@
 
     public float GetCpuUtilization() {
-      return cpuCounter.NextValue();
+      float cpuVal = 0.0F;
+
+      try {
+        return cpuCounter.NextValue();
+      }
+      catch { }
+      return cpuVal;
     }
   }

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

@@ -97 +97 @@
                 SlaveId = info.Id,
                 FreeCores = info.Cores.HasValue ? info.Cores.Value - SlaveStatusInfo.UsedCores : 0,
-                FreeMemory = ConfigManager.GetFreeMemory(),
+                FreeMemory = ConfigManager.Instance.GetFreeMemory(),
                 CpuUtilization = ConfigManager.Instance.GetCpuUtilization(),
                 JobProgress = ConfigManager.Instance.GetExecutionTimeOfAllJobs(),