Changeset 1755 for trunk/sources/HeuristicLab.Hive.Client.Core/3.2
- Timestamp:
- 05/07/09 14:34:33 (15 years ago)
- Location:
- trunk/sources/HeuristicLab.Hive.Client.Core/3.2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Hive.Client.Core/3.2/ConfigurationManager/ConfigManager.cs
r1449 r1755 135 135 } 136 136 137 public int GetUsedCores() { 138 Dictionary<Guid, Executor> engines = Core.GetExecutionEngines(); 139 Dictionary<Guid, Job> jobs = Core.GetJobs(); 140 int usedCores = 0; 141 lock (engines) { 142 foreach (KeyValuePair<Guid, Job> kvp in jobs) 143 usedCores += kvp.Value.CoresNeeded; 144 } 145 return usedCores; 146 } 147 137 148 } 138 149 } -
trunk/sources/HeuristicLab.Hive.Client.Core/3.2/Core.cs
r1719 r1755 65 65 public void Start() { 66 66 abortRequested = false; 67 67 PluginManager.Manager.Initialize(); 68 68 Logging.Instance.Info(this.ToString(), "Hive Client started"); 69 69 ClientConsoleServer server = new ClientConsoleServer(); … … 206 206 207 207 void wcfService_SendJobCompleted(object sender, SendJobCompletedEventArgs e) { 208 if (e.Result.StatusMessage != ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT) { 208 if (e.Result.StatusMessage != ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT) { 209 209 bool sandboxed = false; 210 211 PluginManager.Manager.Initialize();210 //todo: For testing!!! 211 //beat.StopHeartBeat(); 212 212 //Todo: make a set & override the equals method 213 213 List<byte[]> files = new List<byte[]>(); … … 305 305 306 306 } 307 308 internal Dictionary<Guid, Job> GetJobs() { 309 return jobs; 310 } 307 311 } 308 312 } -
trunk/sources/HeuristicLab.Hive.Client.Core/3.2/Heartbeat.cs
r1530 r1755 78 78 int mb = (int)(counter.NextValue() / 1024 / 1024); 79 79 80 80 81 81 82 HeartBeatData heartBeatData = new HeartBeatData { 82 83 ClientId = info.Id, 83 FreeCores = info.NrOfCores - (ClientStatusInfo.JobsFetched - ClientStatusInfo.JobsProcessed),84 FreeCores = info.NrOfCores - ConfigManager.Instance.GetUsedCores(), 84 85 FreeMemory = mb, 85 86 JobProgress = ConfigManager.Instance.GetProgressOfAllJobs()
Note: See TracChangeset
for help on using the changeset viewer.