Changeset 34

Timestamp:

03/01/08 15:19:15 (16 years ago)

Author:

gkronber

Message:

return the whole engine as the result instead of only the scope

(ticket ref #2)

Location:

trunk/sources

Files:

• HeuristicLab.DistributedEngine/DistributedEngine.cs (modified) (1 diff)
• HeuristicLab.Grid/ClientForm.cs (modified) (2 diffs)
• HeuristicLab.Grid/EngineStore.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.DistributedEngine/DistributedEngine.cs

@@ -90 +90 @@
       if(runningEngines.Count != 0) {
         Guid engineGuid = runningEngines[0];
-        byte[] scopeXml = server.TryEndExecuteEngine(engineGuid,100);
-        if(scopeXml != null) {
-          GZipStream stream = new GZipStream(new MemoryStream(scopeXml), CompressionMode.Decompress);
-          IScope newScope = (IScope)PersistenceManager.Load(stream);
+        byte[] resultXml = server.TryEndExecuteEngine(engineGuid,100);
+        if(resultXml != null) {
+          GZipStream stream = new GZipStream(new MemoryStream(resultXml), CompressionMode.Decompress);
+          ProcessingEngine resultEngine = (ProcessingEngine)PersistenceManager.Load(stream);
           IScope oldScope = engineOperations[engineGuid].Scope;
           oldScope.Clear();
-          foreach(IVariable variable in newScope.Variables) {
+          foreach(IVariable variable in resultEngine.InitialOperation.Scope.Variables) {
             oldScope.AddVariable(variable);
           }
-          foreach(IScope subScope in newScope.SubScopes) {
+          foreach(IScope subScope in resultEngine.InitialOperation.Scope.SubScopes) {
             oldScope.AddSubScope(subScope);
           }

trunk/sources/HeuristicLab.Grid/ClientForm.cs

@@ -102 +102 @@
         if (InvokeRequired) { Invoke((MethodInvoker)delegate() { statusTextBox.Text = "Executing engine"; }); } else statusTextBox.Text = "Executing engine";
         currentEngine.Finished += delegate(object src, EventArgs args) {
-          byte[] resultScopeXml = SaveScope(currentEngine.InitialOperation.Scope);
-          engineStore.StoreResult(currentGuid, resultScopeXml);
+          byte[] resultXml = SaveEngine(currentEngine);
+          engineStore.StoreResult(currentGuid, resultXml);
           currentGuid = Guid.Empty;
           currentEngine = null;
@@ -127 +127 @@
       return (ProcessingEngine)PersistenceManager.Load(stream);
     }
-    private byte[] SaveScope(IScope scope) {
+    private byte[] SaveEngine(IEngine engine) {
       MemoryStream memStream = new MemoryStream();
       GZipStream stream = new GZipStream(memStream, CompressionMode.Compress, true);
-      PersistenceManager.Save(scope, stream);
+      PersistenceManager.Save(engine, stream);
       stream.Close();
       return memStream.ToArray();

trunk/sources/HeuristicLab.Grid/EngineStore.cs

@@ -29 +29 @@
   [ServiceBehavior(InstanceContextMode = InstanceContextMode.Single, ConcurrencyMode = ConcurrencyMode.Multiple, UseSynchronizationContext = false)]
   public class EngineStore : IEngineStore {
-    private Queue<Guid> engineQueue;
+    private List<Guid> engineList;
     private Dictionary<Guid, byte[]> waitingEngines;
     private Dictionary<Guid, byte[]> runningEngines;
@@ -56 +56 @@
 
     public EngineStore() {
-      engineQueue = new Queue<Guid>();
+      engineList = new List<Guid>();
       waitingEngines = new Dictionary<Guid, byte[]>();
       runningEngines = new Dictionary<Guid, byte[]>();
@@ -75 +75 @@
     public bool TryTakeEngine(string clientUrl, out Guid guid, out byte[] engine) {
       lock(bigLock) {
-        if(engineQueue.Count == 0) {
+        if(engineList.Count == 0) {
           guid = Guid.Empty;
           engine = null;
           return false;
         } else {
-          guid = engineQueue.Dequeue();
+          guid = engineList[0];
+          engineList.RemoveAt(0);
           engine = waitingEngines[guid];
           waitingEngines.Remove(guid);
@@ -103 +104 @@
     internal void AddEngine(Guid guid, byte[] engine) {
       lock(bigLock) {
-        engineQueue.Enqueue(guid);
+        engineList.Add(guid);
         waitingEngines.Add(guid, engine);
         waitHandles.Add(guid, new ManualResetEvent(false));
-      }
-    }
-
-    internal byte[] RemoveResult(Guid guid) {
-      lock(bigLock) {
-        byte[] result = results[guid];
-        results.Remove(guid);
-        return result;
       }
     }
@@ -144 +137 @@
         if(runningClients.ContainsKey(guid)) {
           clientUrl = runningClients[guid];
-        }
-
-        if(clientUrl != "") {
           IClient client = clientChannelFactory.CreateChannel(new EndpointAddress(clientUrl));
           client.Abort(guid);
+        } else if(waitingEngines.ContainsKey(guid)) {
+          byte[] engine = waitingEngines[guid];
+          waitingEngines.Remove(guid);
+          engineList.Remove(guid);
+          results.Add(guid, engine);
         }
       }