Changeset 33 for trunk/sources/HeuristicLab.Grid

Timestamp:

03/01/08 15:05:37 (16 years ago)

Author:

gkronber

Message:

• worked on #2
• fixed some problems in communication between Grid and DistributedEngine

Location:

trunk/sources/HeuristicLab.Grid

Files:

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

trunk/sources/HeuristicLab.Grid/EngineStore.cs

@@ -32 +32 @@
     private Dictionary<Guid, byte[]> waitingEngines;
     private Dictionary<Guid, byte[]> runningEngines;
+    private Dictionary<Guid, ManualResetEvent> waitHandles;
     private Dictionary<Guid, byte[]> results;
     private Dictionary<Guid, string> runningClients;
     private object bigLock;
     private ChannelFactory<IClient> clientChannelFactory;
-
-    private event EventHandler ResultRecieved;
-
     public int WaitingJobs {
       get {
@@ -62 +60 @@
       runningEngines = new Dictionary<Guid, byte[]>();
       runningClients = new Dictionary<Guid, string>();
+      waitHandles = new Dictionary<Guid, ManualResetEvent>();
       results = new Dictionary<Guid, byte[]>();
       bigLock = new object();
@@ -98 +97 @@
         runningClients.Remove(guid);
         results[guid] = result;
-        OnResultRecieved(guid);
+        waitHandles[guid].Set();
       }
     }
@@ -106 +105 @@
         engineQueue.Enqueue(guid);
         waitingEngines.Add(guid, engine);
+        waitHandles.Add(guid, new ManualResetEvent(false));
       }
     }
@@ -118 +118 @@
 
     internal byte[] GetResult(Guid guid) {
-      ManualResetEvent waitHandle = new ManualResetEvent(false);
+      return GetResult(guid, System.Threading.Timeout.Infinite);
+    }
+    internal byte[] GetResult(Guid guid, int timeout) {
       lock(bigLock) {
-        if(results.ContainsKey(guid)) {
-          byte[] result = results[guid];
-          results.Remove(guid);
-          return result;
+        if(waitHandles.ContainsKey(guid)) {
+          ManualResetEvent waitHandle = waitHandles[guid];
+          if(waitHandle.WaitOne(timeout, false)) {
+            waitHandle.Close();
+            waitHandles.Remove(guid);
+            byte[] result = results[guid];
+            results.Remove(guid);
+            return result;
+          } else {
+            return null;
+          }
         } else {
-          ResultRecieved += delegate(object source, EventArgs args) {
-            ResultRecievedEventArgs resultArgs = (ResultRecievedEventArgs)args;
-            if(resultArgs.resultGuid == guid) {
-              waitHandle.Set();
-            }
-          };
+          return null;
         }
-      }
-
-      waitHandle.WaitOne();
-      waitHandle.Close();
-
-      lock(bigLock) {
-        byte[] result = results[guid];
-        results.Remove(guid);
-        return result;
       }
     }
@@ -157 +152 @@
       }
     }
-
-    private void OnResultRecieved(Guid guid) {
-      ResultRecievedEventArgs args = new ResultRecievedEventArgs();
-      args.resultGuid = guid;
-      if(ResultRecieved != null) {
-        ResultRecieved(this, args);
-      }
-    }
-
-    private class ResultRecievedEventArgs : EventArgs {
-      public Guid resultGuid;
-    }
   }
 }

trunk/sources/HeuristicLab.Grid/GridServer.cs

@@ -44 +44 @@
       return engineStore.GetResult(guid);
     }
+    public byte[] TryEndExecuteEngine(Guid guid, int timeout) {
+      return engineStore.GetResult(guid, timeout);
+    }
 
     public void AbortEngine(Guid engine) {

trunk/sources/HeuristicLab.Grid/IGridServer.cs

@@ -30 +30 @@
     [OperationContract]
     Guid BeginExecuteEngine(byte[] engine);
-    
     [OperationContract]
     byte[] EndExecuteEngine(Guid engineGuid);
-
+    [OperationContract]
+    byte[] TryEndExecuteEngine(Guid engineGuid, int timeout);
     [OperationContract]
     void AbortEngine(Guid engineGuid);