Changeset 157 for MicroThreading/UMicroThreading.pas

Timestamp:

Jan 28, 2011, 7:33:14 PM (14 years ago)

Author:

george

Message:

• Added: Displaying thread list in Demo.
• Fixed: Terminating and freeing unused threads.

File:

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

MicroThreading/UMicroThreading.pas

@@ -119 +119 @@
   end;
 
+  TMicroThreadThreadState = (ttsReady, ttsRunning, ttsTerminated);
+
   { TMicroThreadThread }
 
   TMicroThreadThread = class(TThread)
     Manager: TMicroThreadManager;
-    ExecuteTerminated: Boolean;
+    State: TMicroThreadThreadState;
     procedure Execute; override;
     constructor Create(CreateSuspended: Boolean;
@@ -140 +142 @@
     FExecuteCount: Integer;
     FExecutedCount: Integer;
-    FTerminated: Boolean;
     FCurrentMicroThread: TMicroThread;
     FScheduler: TMicroThreadScheduler;
@@ -187 +188 @@
     procedure Start;
     procedure Stop;
-    procedure PoolThreadTerminated(Sender: TObject);
     procedure UpdateThreadPoolSize;
     procedure MainThreadStart(Sender: TObject);
@@ -197 +197 @@
     destructor Destroy; override;
     property ThreadPool: TObjectList read FThreadPool;
+    property ThreadPoolLock: TCriticalSection read FThreadPoolLock;
     property ThreadPoolSize: Integer read GetThreadPoolSize
       write SetThreadPoolSize;
@@ -216 +217 @@
   MicroThreadBlockStateText: array[TMicroThreadBlockState] of string = ('None',
     'Sleeping', 'WaitFor', 'Terminating', 'Terminated');
+  MicroThreadThreadStateText: array[TMicroThreadThreadState] of string = (
+    'Ready', 'Running', 'Terminated');
 
 function GetCurrentMicroThread: TMicroThread;
@@ -503 +506 @@
   try
     repeat
-      ExecutedCount := Manager.Execute(100000);
+      State := ttsRunning;
+      ExecutedCount := Manager.Execute(10);
+      State := ttsReady;
       if ExecutedCount = 0 then Sleep(1);
     until Terminated;
@@ -516 +521 @@
 begin
   inherited;
-  ExecuteTerminated := False;
+  State := ttsReady;
   Manager := TMicroThreadManager.Create;
 end;
@@ -522 +527 @@
 destructor TMicroThreadThread.Destroy;
 begin
-  Terminate;
-  repeat
-    Sleep(1);
-  until ExecuteTerminated;
-
   Manager.Free;
   inherited Destroy;
@@ -758 +758 @@
 begin
   FState := ssTerminating;
+  // Wait for all thread managers to finish
   try
     FThreadPoolLock.Acquire;
@@ -763 +764 @@
       TMicroThreadThread(FThreadPool[I]).Terminate;
     end;
+    for I := 0 to FThreadPool.Count - 1 do begin
+      TMicroThreadThread(FThreadPool[I]).WaitFor;
+    end;
+    FThreadPool.Clear;
   finally
     FThreadPoolLock.Release;
   end;
 
-  // Wait for all thread managers to finish
   repeat
     Application.ProcessMessages;
     Sleep(1);
-  until FMainThreadTerminated and (ThreadPoolCount = 0);
+  until FMainThreadTerminated or (not FUseMainThread);
   FState := ssStopped;
-end;
-
-procedure TMicroThreadScheduler.PoolThreadTerminated(Sender: TObject);
-var
-  ThreadIndex: Integer;
-begin
-  TMicroThreadThread(Sender).ExecuteTerminated := True;
-  try
-    FThreadPoolLock.Acquire;
-    FThreadPool.OwnsObjects := False;
-    ThreadIndex := FThreadPool.IndexOf(Sender);
-    if ThreadIndex = -1 then
-      raise Exception.Create('Trying to free thread not found in thread pool');
-    FThreadPool.Delete(ThreadIndex);
-  finally
-    FThreadPool.OwnsObjects := True;
-    FThreadPoolLock.Release;
-  end;
 end;
 
@@ -806 +792 @@
         NewThread.Manager.FId := FThreadPool.Count + 1;
         NewThread.Manager.FThread := NewThread;
-        NewThread.OnTerminate := PoolThreadTerminated;
-        NewThread.FreeOnTerminate := True;
+        //NewThread.OnTerminate := PoolThreadTerminated;
+        NewThread.FreeOnTerminate := False;
         ThreadPool.Add(NewThread);
         NewThread.Resume;
@@ -813 +799 @@
     end else begin
       while FThreadPool.Count > FThreadPoolSize do begin
+        TMicroThreadThread(FThreadPool[FThreadPool.Count - 1]).Terminate;
+        TMicroThreadThread(FThreadPool[FThreadPool.Count - 1]).WaitFor;
         FThreadPool.Delete(FThreadPool.Count - 1);
       end;
@@ -946 +934 @@
 
 procedure TMicroThreadScheduler.SetThreadPoolSize(const AValue: Integer);
-var
-  I: Integer;
-  NewThread: TMicroThreadThread;
 begin
   FThreadPoolSize := AValue;