mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-11-04 21:27:06 +01:00
* Add TerminatedSet (delphi compatibility, bug ID #37388)
git-svn-id: trunk@45805 -
This commit is contained in:
parent
043c3df292
commit
b7bd9f3325
@ -116,6 +116,7 @@ end;
|
|||||||
procedure TThread.Terminate;
|
procedure TThread.Terminate;
|
||||||
begin
|
begin
|
||||||
FTerminated := True;
|
FTerminated := True;
|
||||||
|
TerminatedSet;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TThread.WaitFor: Integer;
|
function TThread.WaitFor: Integer;
|
||||||
|
|||||||
@ -74,6 +74,7 @@ end;
|
|||||||
procedure TThread.Terminate;
|
procedure TThread.Terminate;
|
||||||
|
|
||||||
begin
|
begin
|
||||||
|
TerminatedSet;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -274,6 +274,7 @@ end;
|
|||||||
procedure TThread.Terminate;
|
procedure TThread.Terminate;
|
||||||
begin
|
begin
|
||||||
FTerminated := True;
|
FTerminated := True;
|
||||||
|
TerminatedSet;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TThread.WaitFor: Integer;
|
function TThread.WaitFor: Integer;
|
||||||
@ -560,6 +561,7 @@ end;
|
|||||||
procedure TThread.Terminate;
|
procedure TThread.Terminate;
|
||||||
begin
|
begin
|
||||||
FTerminated := True;
|
FTerminated := True;
|
||||||
|
TerminatedSet;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TThread.WaitFor: Integer;
|
function TThread.WaitFor: Integer;
|
||||||
|
|||||||
@ -100,6 +100,7 @@ end;
|
|||||||
procedure TThread.Terminate;
|
procedure TThread.Terminate;
|
||||||
begin
|
begin
|
||||||
FTerminated := true;
|
FTerminated := true;
|
||||||
|
TerminatedSet;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -99,7 +99,8 @@ end;
|
|||||||
|
|
||||||
procedure TThread.Terminate;
|
procedure TThread.Terminate;
|
||||||
begin
|
begin
|
||||||
FTerminated := true;
|
FTerminated := true;
|
||||||
|
TerminatedSet;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -99,7 +99,8 @@ end;
|
|||||||
|
|
||||||
procedure TThread.Terminate;
|
procedure TThread.Terminate;
|
||||||
begin
|
begin
|
||||||
FTerminated := true;
|
FTerminated := true;
|
||||||
|
TerminatedSet;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -74,6 +74,7 @@ end;
|
|||||||
procedure TThread.Terminate;
|
procedure TThread.Terminate;
|
||||||
|
|
||||||
begin
|
begin
|
||||||
|
TerminatedSet;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -74,6 +74,7 @@ end;
|
|||||||
procedure TThread.Terminate;
|
procedure TThread.Terminate;
|
||||||
|
|
||||||
begin
|
begin
|
||||||
|
TerminatedSet;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -74,6 +74,7 @@ end;
|
|||||||
procedure TThread.Terminate;
|
procedure TThread.Terminate;
|
||||||
|
|
||||||
begin
|
begin
|
||||||
|
TerminatedSet;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -48,6 +48,7 @@ end;
|
|||||||
procedure TThread.Terminate;
|
procedure TThread.Terminate;
|
||||||
begin
|
begin
|
||||||
FTerminated := True;
|
FTerminated := True;
|
||||||
|
TerminatedSet;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TThread.WaitFor: Integer;
|
function TThread.WaitFor: Integer;
|
||||||
|
|||||||
@ -99,7 +99,8 @@ end;
|
|||||||
|
|
||||||
procedure TThread.Terminate;
|
procedure TThread.Terminate;
|
||||||
begin
|
begin
|
||||||
FTerminated := true;
|
FTerminated := true;
|
||||||
|
TerminatedSet;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -219,6 +219,7 @@ end;
|
|||||||
procedure TThread.Terminate;
|
procedure TThread.Terminate;
|
||||||
begin
|
begin
|
||||||
FTerminated := True;
|
FTerminated := True;
|
||||||
|
TerminatedSet;
|
||||||
ThreadSwitch;
|
ThreadSwitch;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|||||||
@ -364,6 +364,7 @@ end;
|
|||||||
procedure TThread.Terminate;
|
procedure TThread.Terminate;
|
||||||
begin
|
begin
|
||||||
FTerminated := True;
|
FTerminated := True;
|
||||||
|
TerminatedSet;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TThread.WaitFor: Integer;
|
function TThread.WaitFor: Integer;
|
||||||
|
|||||||
@ -274,6 +274,13 @@ begin
|
|||||||
GetSuspended:=FSuspended;
|
GetSuspended:=FSuspended;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
Procedure TThread.TerminatedSet;
|
||||||
|
|
||||||
|
begin
|
||||||
|
// Empty, must be overridden.
|
||||||
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
procedure TThread.AfterConstruction;
|
procedure TThread.AfterConstruction;
|
||||||
begin
|
begin
|
||||||
|
|||||||
@ -1907,6 +1907,7 @@ type
|
|||||||
protected
|
protected
|
||||||
FThreadID: TThreadID; // someone might need it for pthread_* calls
|
FThreadID: TThreadID; // someone might need it for pthread_* calls
|
||||||
procedure DoTerminate; virtual;
|
procedure DoTerminate; virtual;
|
||||||
|
procedure TerminatedSet; virtual;
|
||||||
procedure Execute; virtual; abstract;
|
procedure Execute; virtual; abstract;
|
||||||
procedure Synchronize(AMethod: TThreadMethod);
|
procedure Synchronize(AMethod: TThreadMethod);
|
||||||
procedure Queue(aMethod: TThreadMethod);
|
procedure Queue(aMethod: TThreadMethod);
|
||||||
@ -1989,7 +1990,7 @@ type
|
|||||||
property ThreadID: TThreadID read FThreadID;
|
property ThreadID: TThreadID read FThreadID;
|
||||||
property OnTerminate: TNotifyEvent read FOnTerminate write FOnTerminate;
|
property OnTerminate: TNotifyEvent read FOnTerminate write FOnTerminate;
|
||||||
property FatalException: TObject read FFatalException;
|
property FatalException: TObject read FFatalException;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
{ TComponent class }
|
{ TComponent class }
|
||||||
|
|||||||
@ -212,7 +212,8 @@ end;
|
|||||||
|
|
||||||
procedure TThread.Terminate;
|
procedure TThread.Terminate;
|
||||||
begin
|
begin
|
||||||
FTerminated := true;
|
FTerminated := true;
|
||||||
|
TerminatedSet;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -99,7 +99,8 @@ end;
|
|||||||
|
|
||||||
procedure TThread.Terminate;
|
procedure TThread.Terminate;
|
||||||
begin
|
begin
|
||||||
FTerminated := true;
|
FTerminated := true;
|
||||||
|
TerminatedSet;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -253,6 +253,7 @@ end;
|
|||||||
procedure TThread.Terminate;
|
procedure TThread.Terminate;
|
||||||
begin
|
begin
|
||||||
FTerminated := True;
|
FTerminated := True;
|
||||||
|
TerminatedSet;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TThread.WaitFor: Integer;
|
function TThread.WaitFor: Integer;
|
||||||
|
|||||||
@ -100,6 +100,7 @@ end;
|
|||||||
procedure TThread.Terminate;
|
procedure TThread.Terminate;
|
||||||
begin
|
begin
|
||||||
FTerminated := true;
|
FTerminated := true;
|
||||||
|
TerminatedSet;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -95,6 +95,7 @@ end;
|
|||||||
procedure TThread.Terminate;
|
procedure TThread.Terminate;
|
||||||
begin
|
begin
|
||||||
FTerminated := True;
|
FTerminated := True;
|
||||||
|
TerminatedSet;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TThread.WaitFor: Integer;
|
function TThread.WaitFor: Integer;
|
||||||
|
|||||||
@ -74,6 +74,7 @@ end;
|
|||||||
procedure TThread.Terminate;
|
procedure TThread.Terminate;
|
||||||
|
|
||||||
begin
|
begin
|
||||||
|
TerminatedSet;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user