Changeset 36

Timestamp:

03/01/08 20:34:08 (17 years ago)

Author:

gkronber

Message:

shaky version of stop functionality (ticket #2). Open problem: continue distributed execution after engine stop. Right now after stopping the engine the waiting operations are executed locally.

File:

• trunk/sources/HeuristicLab.DistributedEngine/DistributedEngine.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.DistributedEngine/DistributedEngine.cs

@@ -38 +38 @@
     private string serverAddress;
     private bool cancelRequested;
+    private CompositeOperation waitingOperations;
     public string ServerAddress {
       get { return serverAddress; }
@@ -48 +49 @@
     public override bool Terminated {
       get {
-        return myExecutionStack.Count == 0 && runningEngines.Count == 0;
+        return myExecutionStack.Count == 0 && runningEngines.Count == 0 && waitingOperations==null;
       }
     }
@@ -100 +101 @@
           base.Abort();
           cancelRequested = false;
+          if(waitingOperations != null && waitingOperations.Operations.Count != 0) {
+            myExecutionStack.Push(waitingOperations);
+            waitingOperations = null;
+          }
           return;
         }
@@ -117 +122 @@
             }
             OnOperationExecuted(engineOperations[engineGuid]);
-            if(resultEngine.ExecutionStack.Count != 0) {
-              foreach(IOperation op in resultEngine.ExecutionStack) {
-                myExecutionStack.Push(op);
+
+            if(cancelRequested & resultEngine.ExecutionStack.Count != 0) {
+              if(waitingOperations == null) {
+                waitingOperations = new CompositeOperation();
+                waitingOperations.ExecuteInParallel = false;
               }
+              CompositeOperation task = new CompositeOperation();
+              while(resultEngine.ExecutionStack.Count > 0) {
+                AtomicOperation oldOperation = (AtomicOperation)resultEngine.ExecutionStack.Pop();
+                if(oldOperation.Scope == resultEngine.InitialOperation.Scope) {
+                  oldOperation = new AtomicOperation(oldOperation.Operator, oldScope);
+                }
+                task.AddOperation(oldOperation);
+              }
+              waitingOperations.AddOperation(task);
             }
             runningEngines.Remove(engineGuid);