Changeset 4253 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/DefaultScheduler.cs

Timestamp:

08/18/10 15:29:57 (14 years ago)

Author:

cneumuel

Message:

Rename "Client" to "Slave" #1157

File:

• branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/DefaultScheduler.cs (modified) (1 diff)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/DefaultScheduler.cs

@@ -24 +24 @@
     }
 
-    public bool ExistsJobForClient(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
-      List<JobDto> allOfflineJobsForClient =
-        new List<JobDto>(DaoLocator.JobDao.FindFittingJobsForClient(State.Offline, hbData.FreeCores, hbData.FreeMemory, hbData.ClientId));
-      return (allOfflineJobsForClient != null && allOfflineJobsForClient.Count > 0);
+    public bool ExistsJobForSlave(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
+      List<JobDto> allOfflineJobsForSlave =
+        new List<JobDto>(DaoLocator.JobDao.FindFittingJobsForSlave(State.Offline, hbData.FreeCores, hbData.FreeMemory, hbData.SlaveId));
+      return (allOfflineJobsForSlave != null && allOfflineJobsForSlave.Count > 0);
     }
 
-    public HeuristicLab.Hive.Contracts.BusinessObjects.JobDto GetNextJobForClient(Guid clientId) {
+    public HeuristicLab.Hive.Contracts.BusinessObjects.JobDto GetNextJobForSlave(Guid slaveId) {
       /// Critical section ///
       jobLock.WaitOne();
       JobDto jobToCalculate = null;
       using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE })) {
-        ClientDto client = DaoLocator.ClientDao.FindById(clientId);
-        LinkedList<JobDto> allOfflineJobsForClient =
-          new LinkedList<JobDto>(DaoLocator.JobDao.FindFittingJobsForClient(State.Offline, client.NrOfFreeCores, client.FreeMemory, client.Id));        
-        if (allOfflineJobsForClient != null && allOfflineJobsForClient.Count > 0) {
-          jobToCalculate = allOfflineJobsForClient.First.Value;
+        ClientDto slave = DaoLocator.ClientDao.FindById(slaveId);
+        LinkedList<JobDto> allOfflineJobsForSlave =
+          new LinkedList<JobDto>(DaoLocator.JobDao.FindFittingJobsForSlave(State.Offline, slave.NrOfFreeCores, slave.FreeMemory, slave.Id));        
+        if (allOfflineJobsForSlave != null && allOfflineJobsForSlave.Count > 0) {
+          jobToCalculate = allOfflineJobsForSlave.First.Value;
           jobToCalculate.State = State.Calculating;
-          jobToCalculate.Client = client;
+          jobToCalculate.Client = slave;
           jobToCalculate.Client.State = State.Calculating;
           jobToCalculate.DateCalculated = DateTime.Now;
-          DaoLocator.JobDao.AssignClientToJob(client.Id, jobToCalculate.Id);
+          DaoLocator.JobDao.AssignSlaveToJob(slave.Id, jobToCalculate.Id);
           DaoLocator.JobDao.Update(jobToCalculate);
           DaoLocator.ClientDao.Update(jobToCalculate.Client);