Changeset 1755 for trunk

Timestamp:

05/07/09 14:34:33 (16 years ago)

Author:

kgrading

Message:

added the "coresNeeded" and made a fallback concerning dynamic plugin loading... (#467)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Core/3.2/ConfigurationManager/ConfigManager.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/3.2/Core.cs (modified) (3 diffs)
• HeuristicLab.Hive.Client.Core/3.2/Heartbeat.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/PluginManager.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/ConfigurationManager/ConfigManager.cs

@@ -135 +135 @@
     }
 
+    public int GetUsedCores() {
+      Dictionary<Guid, Executor> engines = Core.GetExecutionEngines();
+      Dictionary<Guid, Job> jobs = Core.GetJobs();
+      int usedCores = 0;
+      lock (engines) {        
+        foreach (KeyValuePair<Guid, Job> kvp in jobs)
+          usedCores += kvp.Value.CoresNeeded;
+      }
+      return usedCores;
+    }
+
   }
 }

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

@@ -65 +65 @@
     public void Start() {      
       abortRequested = false;
-
+      PluginManager.Manager.Initialize();
       Logging.Instance.Info(this.ToString(), "Hive Client started");
       ClientConsoleServer server = new ClientConsoleServer();
@@ -206 +206 @@
 
     void wcfService_SendJobCompleted(object sender, SendJobCompletedEventArgs e) {
-      if (e.Result.StatusMessage != ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT) {
+      if (e.Result.StatusMessage != ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT) {        
         bool sandboxed = false;
-
-        PluginManager.Manager.Initialize();
+        //todo: For testing!!!
+        //beat.StopHeartBeat();        
         //Todo: make a set & override the equals method
         List<byte[]> files = new List<byte[]>();
@@ -305 +305 @@
       
     }
+
+    internal Dictionary<Guid, Job> GetJobs() {
+      return jobs;
+    }
   }
 }

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

@@ -78 +78 @@
       int mb = (int)(counter.NextValue() / 1024 / 1024);
 
+      
 
-        HeartBeatData heartBeatData = new HeartBeatData {
+      HeartBeatData heartBeatData = new HeartBeatData {
         ClientId = info.Id,
-        FreeCores = info.NrOfCores - (ClientStatusInfo.JobsFetched - ClientStatusInfo.JobsProcessed),
+        FreeCores = info.NrOfCores - ConfigManager.Instance.GetUsedCores(),
         FreeMemory = mb,
         JobProgress = ConfigManager.Instance.GetProgressOfAllJobs()

trunk/sources/HeuristicLab.PluginInfrastructure/PluginManager.cs

@@ -229 +229 @@
       NotifyListeners(PluginManagerAction.Initializing, "All plugins");
 
-      if (assemblyFiles != null && assemblyFiles.Count > 0)
-        remoteRunner.LoadPlugins(assemblyFiles);
+      //if (assemblyFiles != null && assemblyFiles.Count > 0)
+      //  remoteRunner.LoadPlugins(assemblyFiles);
       
-      /*if (depPlugins != null && depPlugins.Count > 0) {        
-        remoteRunner.LoadPlugins(depPlugins);
-      }*/
+      //if (depPlugins != null && depPlugins.Count > 0) {        
+        remoteRunner.LoadPlugins(ActivePlugins);
+      //}
       NotifyListeners(PluginManagerAction.Initialized, "All plugins");
       return applicationDomain;