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

Timestamp:

08/18/10 17:23:09 (14 years ago)

Author:

cneumuel

Message:

some small refactorings (#1159)

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

@@ -13 +13 @@
 namespace HeuristicLab.Hive.Server.Core {
   internal class DefaultScheduler : IScheduler {
-    //private ISessionFactory factory;
 
-    private static Mutex jobLock =
-      new Mutex();
+    private static object jobLock = new object();
 
     #region IScheduler Members
 
-    public DefaultScheduler() {
-      //factory = ServiceLocator.GetSessionFactory();
-    }
+    public DefaultScheduler() { }
 
-    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));
+    public bool ExistsJobForSlave(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 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 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 = slave;
-          jobToCalculate.Client.State = State.Calculating;
-          jobToCalculate.DateCalculated = DateTime.Now;
-          DaoLocator.JobDao.AssignSlaveToJob(slave.Id, jobToCalculate.Id);
-          DaoLocator.JobDao.Update(jobToCalculate);
-          DaoLocator.ClientDao.Update(jobToCalculate.Client);
+    public JobDto GetNextJobForSlave(Guid slaveId) {
+      lock (jobLock) {
+        /// Critical section ///
+        JobDto jobToCalculate = null;
+        using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE })) {
+          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 = slave;
+            jobToCalculate.Client.State = State.Calculating;
+            jobToCalculate.DateCalculated = DateTime.Now;
+            DaoLocator.JobDao.AssignSlaveToJob(slave.Id, jobToCalculate.Id);
+            DaoLocator.JobDao.Update(jobToCalculate);
+            DaoLocator.ClientDao.Update(jobToCalculate.Client);
+          }
+          scope.Complete();
         }
-        scope.Complete();
+        /// End Critical section ///
+
+        return jobToCalculate;
       }
-      jobLock.ReleaseMutex();
-      /// End Critical section ///
-
-      return jobToCalculate;
     }