Changeset 9373

Timestamp:

04/17/13 15:43:37 (12 years ago)

Author:

pfleck

Message:

#2030
Added MultiSlaveRunner for starting multiple Slave Cores on a single Machine.
Mocked GUID generation for slaves to random GUID.
Deactivated PerformanceCounter measurements from ConfigManager to avoid shared resource locks.

Location:

branches/HivePerformance/sources

Files:

• HeuristicLab 3.3 Hive.Slave.sln (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner (added)
• HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner/3.3 (added)
• HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner/3.3/HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner-3.3.csproj (added)
• HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner/3.3/Program.cs (added)
• HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner/3.3/Properties (added)
• HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner/3.3/Properties/AssemblyInfo.cs.frame (added)
• HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner/3.3/Properties/Settings.Designer.cs (added)
• HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner/3.3/Properties/Settings.settings (added)
• HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner/3.3/SlaveCommListener.cs (added)
• HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner/3.3/app.config (added)
• HeuristicLab.Clients.Hive.Slave/3.3/Manager/ConfigManager.cs (modified) (7 diffs)

branches/HivePerformance/sources/HeuristicLab 3.3 Hive.Slave.sln

@@ -17 +17 @@
 EndProject
 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "HeuristicLab.Clients.Hive.Slave.WindowsServiceSetup-3.3", "HeuristicLab.Clients.Hive.Slave.WindowsServiceSetup\HeuristicLab.Clients.Hive.Slave.WindowsServiceSetup.vdproj", "{C16CA1A6-7AE8-4B87-A6A6-9C290E8B9646}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner-3.3", "HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner\3.3\HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner-3.3.csproj", "{597AF775-8F89-4139-B303-FC14F0CC828A}"
 EndProject
 Global
@@ -124 +126 @@
     {C16CA1A6-7AE8-4B87-A6A6-9C290E8B9646}.Release|x86.ActiveCfg = Release
     {C16CA1A6-7AE8-4B87-A6A6-9C290E8B9646}.Release|x86.Build.0 = Release
+    {597AF775-8F89-4139-B303-FC14F0CC828A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {597AF775-8F89-4139-B303-FC14F0CC828A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {597AF775-8F89-4139-B303-FC14F0CC828A}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {597AF775-8F89-4139-B303-FC14F0CC828A}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {597AF775-8F89-4139-B303-FC14F0CC828A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {597AF775-8F89-4139-B303-FC14F0CC828A}.Release|Any CPU.Build.0 = Release|Any CPU
+    {597AF775-8F89-4139-B303-FC14F0CC828A}.Release|x64.ActiveCfg = Release|Any CPU
+    {597AF775-8F89-4139-B303-FC14F0CC828A}.Release|x86.ActiveCfg = Release|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

branches/HivePerformance/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;
@@ -45 +44 @@
     private TaskManager jobManager;
     private Slave slave;
-    private PerformanceCounter cpuCounter;
-    private PerformanceCounter memCounter;
+    //private PerformanceCounter cpuCounter;
+    //private PerformanceCounter memCounter;
 
     /// <summary>
@@ -53 +52 @@
     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;
@@ -136 +135 @@
 
     public static Guid GetUniqueMachineId() {
+      // mock slave id
+      return Guid.NewGuid();
+      /*
       Guid id;
+
       try {
         id = GetUniqueMachineIdFromMac();
@@ -145 +148 @@
       }
       return id;
+      */
     }
 
@@ -254 +258 @@
 
       try {
-        mb = (int)(memCounter.NextValue() / 1024 / 1024);
+        //mb = (int)(memCounter.NextValue() / 1024 / 1024);
+        mb = 1024;
       }
       catch { }
@@ -262 +267 @@
     public float GetCpuUtilization() {
       float cpuVal = 0.0F;
-
-      try {
+      /*try {
         return cpuCounter.NextValue();
       }
-      catch { }
+      catch { }    */
       return cpuVal;
     }