Changeset 245 for Common/UThreading.pas

Timestamp:

May 23, 2011, 10:59:04 AM (13 years ago)

Author:

george

Message:

• Added: Thread safe global thread list management.
• Added: DeleteFiles routine.
• Modified: GetUserNameEx use dynamic loaded library.

File:

• Common/UThreading.pas (modified) (7 diffs)

Common/UThreading.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Forms, Contnrs;
+  Classes, SysUtils, Forms, Contnrs, SyncObjs;
 
 type
-
+  TExceptionEvent = procedure (Sender: TObject; E: Exception) of object;
   TMethodCall = procedure of object;
-
-  { TTermThread }
-
-  TTermThread = class(TThread)
-    Finished: Boolean;
-    Method: TMethodCall;
-    procedure Execute; override;
-  end;
 
   { TListedThread }
@@ -28 +20 @@
     destructor Destroy; override;
     procedure Sleep(Delay: Integer);
+    property Terminated;
+  end;
+
+  { TTermThread }
+
+  TTermThread = class(TListedThread)
+  private
+  public
+    Finished: Boolean;
+    Method: TMethodCall;
+    procedure Execute; override;
   end;
 
 var
-  ThreadList: TObjectList; // TListedThread
+  ThreadList: TObjectList; // TList<TListedThread>
+  ThreadListLock: TCriticalSection;
+  OnException: TExceptionEvent;
 
 procedure RunInThread(Method: TMethodCall);
 procedure Synchronize(Method: TMethodCall);
+
+resourcestring
+  SCurrentThreadNotFound = 'Current thread ID %d not found in list.';
 
 
@@ -49 +57 @@
     Thread.Method := Method;
     while not Thread.Finished do begin
-      Application.ProcessMessages;
+      if MainThreadID = ThreadID then Application.ProcessMessages;
       Sleep(1);
     end;
@@ -70 +78 @@
       Thread := TListedThread(ThreadList[I]);
       TThread.Synchronize(Thread, Method);
-    end else raise Exception.Create(Format('Current thread ID %d not found in list.', [ThreadID]));
+    end else raise Exception.Create(Format(SCurrentThreadNotFound, [ThreadID]));
   end;
 end;
@@ -80 +88 @@
 begin
   inherited;
-  ThreadList.Add(Self);
+  try
+    ThreadListLock.Acquire;
+    ThreadList.Add(Self);
+  finally
+    ThreadListLock.Release;
+  end;
 end;
 
 destructor TListedThread.Destroy;
 begin
-  ThreadList.Delete(ThreadList.IndexOf(Self));
+  if not Suspended then
+  begin
+    Terminate;
+    WaitFor;
+  end;
+  try
+    ThreadListLock.Acquire;
+    ThreadList.Delete(ThreadList.IndexOf(Self));
+  finally
+    ThreadListLock.Release;
+  end;
   inherited Destroy;
 end;
@@ -106 +129 @@
 procedure TTermThread.Execute;
 begin
-  Method;
-  Finished := True;
+  try
+    Method;
+    Finished := True;
+  except
+    on E: Exception do
+      if Assigned(OnException) then
+        OnException(Self, E);
+  end;
 end;
 
 initialization
 
+ThreadListLock := TCriticalSection.Create;
 ThreadList := TObjectList.Create;
 ThreadList.OwnsObjects := False;
@@ -118 +148 @@
 
 ThreadList.Free;
+ThreadListLock.Free;
 
 end.