Changeset 209

Timestamp:

May 22, 2018, 11:12:14 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Use TThreadID type for thread ID to work correctly under 64-bit system.

File:

• trunk/Packages/Common/UThreading.pas (modified) (9 diffs)

trunk/Packages/Common/UThreading.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Forms, Contnrs, SyncObjs;
+  Classes, SysUtils, Forms, fgl, SyncObjs;
 
 type
@@ -22 +22 @@
     function GetSuspended: Boolean; virtual; abstract;
     function GetTerminated: Boolean; virtual; abstract;
-    function GetThreadId: Integer; virtual; abstract;
+    function GetThreadId: TThreadID; virtual; abstract;
     procedure SetFreeOnTerminate(const AValue: Boolean); virtual; abstract;
     procedure SetPriority(const AValue: TThreadPriority); virtual; abstract;
@@ -42 +42 @@
     property Terminated: Boolean read GetTerminated write SetTerminated;
     property Finished: Boolean read GetFinished;
-    property ThreadId: Integer read GetThreadId;
+    property ThreadId: TThreadID read GetThreadId;
   end;
 
@@ -68 +68 @@
     function GetSuspended: Boolean; override;
     function GetTerminated: Boolean; override;
-    function GetThreadId: Integer; override;
+    function GetThreadId: TThreadID; override;
     procedure SetFreeOnTerminate(const AValue: Boolean); override;
     procedure SetPriority(const AValue: TThreadPriority); override;
@@ -102 +102 @@
   { TThreadList }
 
-  TThreadList = class(TObjectList)
-    function FindById(Id: Integer): TVirtualThread;
+  TThreadList = class(TFPGObjectList<TVirtualThread>)
+    function FindById(Id: TThreadID): TVirtualThread;
     constructor Create; virtual;
   end;
@@ -164 +164 @@
   if MainThreadID = ThreadID then Method
   else begin
-    Thread := ThreadList.FindById(ThreadID);
+    try
+      ThreadListLock.Acquire;
+      Thread := ThreadList.FindById(ThreadID);
+    finally
+      ThreadListLock.Release;
+    end;
     if Assigned(Thread) then begin
       Thread.Synchronize(Method);
@@ -173 +178 @@
 { TThreadList }
 
-function TThreadList.FindById(Id: Integer): TVirtualThread;
+function TThreadList.FindById(Id: TThreadID): TVirtualThread;
 var
   I: Integer;
 begin
   I := 0;
-  while (I < ThreadList.Count) and (TVirtualThread(ThreadList[I]).ThreadID <> Id) do
+  while (I < ThreadList.Count) and (ThreadList[I].ThreadID <> Id) do
     Inc(I);
-  if I < ThreadList.Count then Result := TVirtualThread(ThreadList[I])
+  if I < ThreadList.Count then Result := ThreadList[I]
     else Result := nil;
 end;
@@ -233 +238 @@
 end;
 
-function TListedThread.GetThreadId: Integer;
+function TListedThread.GetThreadId: TThreadID;
 begin
   Result := FThread.ThreadID;
@@ -356 +361 @@
 ThreadListLock := TCriticalSection.Create;
 ThreadList := TThreadList.Create;
-ThreadList.OwnsObjects := False;
+ThreadList.FreeObjects := False;
 
 finalization