Changeset 146 for MicroThreading/UMicroThreading.pas

Timestamp:

Jan 26, 2011, 7:28:29 AM (14 years ago)

Author:

george

Message:

• Fixed: Freeing micro threads on finish.

File:

• MicroThreading/UMicroThreading.pas (modified) (4 diffs)

MicroThreading/UMicroThreading.pas

@@ -45 +45 @@
     Manager: TMicroThreadManager;
     Scheduler: TMicroThreadScheduler;
+    Completion: Single; // Can be used for progress information in range <0, 1>
     procedure Execute; virtual;
 
@@ -247 +248 @@
         mov edx, [eax].TMicroThread.FStackPointer
         mov esp, edx
+        push ebp
         mov edx, [eax].TMicroThread.FBasePointer
         mov ebp, edx
       end;
       StaticMicroThread.Execute;
+      asm
+        pop ebp
+      end;
       //FSelected.Method(FSelected);
-      StaticManager := StaticMicroThread.Manager;
+      StaticManager := CurrentMicroThread.Manager;
       asm
         // Restore scheduler stack
@@ -267 +272 @@
       CurrentMicroThread.FFinished := True;
       if CurrentMicroThread.FFreeOnTerminate then begin
-        CurrentMicroThread.Free;
+        // Microthread is finished, remove it from queue
+        with Scheduler do
+        try
+          Lock.Acquire;
+          MicroThreads.Delete(MicroThreads.IndexOf(CurrentMicroThread));
+        finally
+          Lock.Release;
+        end;
       end;
       CurrentMicroThread := nil;
@@ -387 +399 @@
 destructor TMicroThread.Destroy;
 begin
-  Terminate;
-  WaitFor;
-  // Microthread is finished, remove it from queue
-  try
-    Manager.Scheduler.Lock.Acquire;
-    Manager.Scheduler.MicroThreads.Delete(Manager.Scheduler.MicroThreads.IndexOf(Self));
-  finally
-    Manager.Scheduler.Lock.Release;
-  end;
+  //Terminate;
+  //WaitFor;
   FreeMem(FStack);
   inherited Destroy;