Changeset 6371 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Manager/ConfigManager.cs

Timestamp:

06/06/11 18:33:03 (13 years ago)

Author:

ascheibe

Message:

#1233

• code cleanups for slave review
• added switch between privileged and unprivileged sandbox
• removed childjob management because it's not used

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Manager/ConfigManager.cs (modified) (5 diffs)

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -39 +39 @@
 
     /// <summary>
-    /// if the Sleeping is true, the Slave won't accept any new jobs
+    /// if Asleep is true, the Slave won't accept any new jobs
     /// </summary>
     public bool Asleep { get; set; }
-
-    //public Core Core { get; set; }
     private JobManager jobManager;
     private Slave slave;
@@ -111 +109 @@
     public Dictionary<Guid, TimeSpan> GetExecutionTimeOfAllJobs() {
       Dictionary<Guid, TimeSpan> prog = new Dictionary<Guid, TimeSpan>();
-
-      //lock (slaveJobs) {
-      //  foreach (KeyValuePair<Guid, SlaveJob> kvp in slaveJobs) {
-      //    Executor e = kvp.Value.JobExecutor;
-      //    if (e != null && !kvp.Value.Finished) {
-      //      //don't include jobs in hb's which are currently serializing
-      //      if (e.SendHeartbeatForExecutor) {
-      //        prog[e.JobId] = e.ExecutionTime;
-      //      }
-      //    }
-      //  }
-      //}
       prog = jobManager.GetExecutionTimes();
-
       return prog;
     }
@@ -159 +144 @@
 
     /// <summary>
-    /// Generate a guid based on mac address of the first found nic (yes, mac addresses are not unique...).
+    /// Generate a guid based on mac address of the first found nic (yes, mac addresses are not unique...)
+    /// and the machine name.
     /// Format:
     /// 
@@ -169 +155 @@
     /// The mac address is saved in the last 48 bits of the Data 4 segment 
     /// of the guid (first 2 bytes of Data 4 are reserved).
-    /// D1 contains the name of the machine. 
+    /// D1 contains the hash of the machinename. 
     /// </summary>    
     private static Guid GetUniqueMachineIdFromMac() {