Changeset 256

Timestamp:

05/14/08 16:09:10 (16 years ago)

Author:

gkronber

Message:

• added statement to remove results from the job-manager
• added a critical section in case EndExecuteOperation is called while any of the TryGetResult-threads is still running.
• added statements to make sure that streams to (un)zip serialized engines are closed and resources released

(ticket #149)

File:

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

trunk/sources/HeuristicLab.DistributedEngine/JobManager.cs

@@ -65 +65 @@
       stream.Close();
       byte[] zippedEngine = memStream.ToArray();
+      memStream.Close();
       Guid currentEngineGuid = Guid.Empty;
       bool success = false;
@@ -102 +103 @@
 
     public IScope EndExecuteOperation(AtomicOperation operation) {
-      byte[] zippedResult = results[operation];
+      byte[] zippedResult = null;
+      lock(dictionaryLock) {
+        zippedResult = results[operation];
+        results.Remove(operation);
+      }
       // restore the engine 
-      GZipStream stream = new GZipStream(new MemoryStream(zippedResult), CompressionMode.Decompress);
-      ProcessingEngine resultEngine = (ProcessingEngine)PersistenceManager.Load(stream);
-
-      return resultEngine.InitialOperation.Scope;
+      using(GZipStream stream = new GZipStream(new MemoryStream(zippedResult), CompressionMode.Decompress)) {
+        ProcessingEngine resultEngine = (ProcessingEngine)PersistenceManager.Load(stream);
+        return resultEngine.InitialOperation.Scope;
+      }      
     }