Changeset 501 for trunk

Timestamp:

08/12/08 09:04:21 (16 years ago)

Author:

gkronber

Message:

removed wait-handles (ticket #197)

Location:

trunk/sources/HeuristicLab.Grid

Files:

• EngineStore.cs (modified) (3 diffs)
• GridServer.cs (modified) (1 diff)
• IGridServer.cs (modified) (1 diff)
• JobManager.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Grid/EngineStore.cs

@@ -31 +31 @@
   [ServiceBehavior(InstanceContextMode = InstanceContextMode.Single, ConcurrencyMode = ConcurrencyMode.Multiple, UseSynchronizationContext = false)]
   public class EngineStore : IEngineStore {
-    private Dictionary<Guid, ManualResetEvent> waitHandles;
     private Database database;
 
@@ -57 +56 @@
 
     public EngineStore() {
-      waitHandles = new Dictionary<Guid, ManualResetEvent>();
       DbProviderFactory fact;
       fact = DbProviderFactories.GetFactory("System.Data.SQLite");
@@ -90 +88 @@
       // add the new result
       database.SetJobResult(guid, result);
-      waitHandles[guid].Set();
     }
 
     internal void AddEngine(Guid guid, byte[] engine) {
       database.InsertJob(guid, HeuristicLab.Grid.JobState.Waiting, engine);
-      waitHandles.Add(guid, new ManualResetEvent(false));
     }
 
     internal byte[] GetResult(Guid guid) {
-      return GetResult(guid, System.Threading.Timeout.Infinite);
-    }
-
-    internal byte[] GetResult(Guid guid, int timeout) {
       if(JobState(guid) == HeuristicLab.Grid.JobState.Finished) {
-        ManualResetEvent waitHandle = waitHandles[guid];
-        waitHandle.Close();
-        waitHandles.Remove(guid);
         JobEntry entry = database.GetJob(guid);
         return entry.RawData;
       } else {
-        // result not yet available, if there is also no wait-handle for that result then we will never have a result and can return null
-        if(!waitHandles.ContainsKey(guid)) return null;
-        // otherwise we have a wait-handle and can wait for the result
-        ManualResetEvent waitHandle = waitHandles[guid];
-        // wait
-        if(waitHandle.WaitOne(timeout, true)) {
-          // ok got the result in within the wait time => close and remove the wait-hande and return the result
-          waitHandle.Close();
-          waitHandles.Remove(guid);
-          JobEntry entry = database.GetJob(guid);
-          return entry.RawData;
-        } else {
-          // no result yet, check for which jobs we waited too long and requeue those jobs
-          database.RestartExpiredActiveJobs();
-          return null;
-        }
+        // JobState is Busy, Waiting or Unknown
+        // no result yet, check for which jobs we waited too long and requeue those jobs
+        database.RestartExpiredActiveJobs();
+        return null;
       }
     }

trunk/sources/HeuristicLab.Grid/GridServer.cs

@@ -45 +45 @@
     }
 
-    public byte[] EndExecuteEngine(Guid guid) {
+    public byte[] TryEndExecuteEngine(Guid guid) {
       return engineStore.GetResult(guid);
-    }
-    public byte[] TryEndExecuteEngine(Guid guid, int timeout) {
-      return engineStore.GetResult(guid, timeout);
     }
   }

trunk/sources/HeuristicLab.Grid/IGridServer.cs

@@ -41 +41 @@
     Guid BeginExecuteEngine(byte[] engine);
     [OperationContract]
-    byte[] EndExecuteEngine(Guid engineGuid);
-    [OperationContract]
-    byte[] TryEndExecuteEngine(Guid engineGuid, int timeout);
+    byte[] TryEndExecuteEngine(Guid engineGuid);
   }
 }

trunk/sources/HeuristicLab.Grid/JobManager.cs

@@ -251 +251 @@
         try {
           lock(connectionLock) {
-            byte[] zippedResult = server.TryEndExecuteEngine(engineGuid, 100);
+            byte[] zippedResult = server.TryEndExecuteEngine(engineGuid);
             return zippedResult;
           }