mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-07 12:07:58 +02:00
* TThread.Terminate does not have any platform specific behavior (it should only set FTerminated to true and call TerminatedSet), thus move it to the platform independant part
Notes: - Netware had a ThreadSwitch in there, but that is not really required - some platform were missing the setting of FTerminated to True, thus they'll now do that as well git-svn-id: trunk@46543 -
This commit is contained in:
parent
c2c7ac634a
commit
11b601d44c
@ -113,12 +113,6 @@ begin
|
||||
if ResumeThread(FHandle) = 1 then FSuspended := False;
|
||||
end;
|
||||
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := True;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
begin
|
||||
if MainThreadID=GetCurrentThreadID then
|
||||
|
@ -71,13 +71,6 @@ begin
|
||||
end;
|
||||
|
||||
|
||||
procedure TThread.Terminate;
|
||||
|
||||
begin
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
|
||||
begin
|
||||
|
@ -271,12 +271,6 @@ begin
|
||||
end;
|
||||
|
||||
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := True;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
var
|
||||
status : longint;
|
||||
@ -558,12 +552,6 @@ begin
|
||||
end;
|
||||
|
||||
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := True;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
begin
|
||||
WRITE_DEBUG('waiting for thread ',FHandle);
|
||||
|
@ -97,13 +97,6 @@ begin
|
||||
end;
|
||||
|
||||
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := true;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
begin
|
||||
result := -1;
|
||||
|
@ -97,13 +97,6 @@ begin
|
||||
end;
|
||||
|
||||
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := true;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
begin
|
||||
result := -1;
|
||||
|
@ -97,13 +97,6 @@ begin
|
||||
end;
|
||||
|
||||
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := true;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
begin
|
||||
result := -1;
|
||||
|
@ -71,13 +71,6 @@ begin
|
||||
end;
|
||||
|
||||
|
||||
procedure TThread.Terminate;
|
||||
|
||||
begin
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
|
||||
begin
|
||||
|
@ -71,13 +71,6 @@ begin
|
||||
end;
|
||||
|
||||
|
||||
procedure TThread.Terminate;
|
||||
|
||||
begin
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
|
||||
begin
|
||||
|
@ -71,13 +71,6 @@ begin
|
||||
end;
|
||||
|
||||
|
||||
procedure TThread.Terminate;
|
||||
|
||||
begin
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
|
||||
begin
|
||||
|
@ -45,12 +45,6 @@ procedure TThread.Resume;
|
||||
begin
|
||||
end;
|
||||
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := True;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
begin
|
||||
Result := -1;
|
||||
|
@ -97,13 +97,6 @@ begin
|
||||
end;
|
||||
|
||||
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := true;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
begin
|
||||
result := -1;
|
||||
|
@ -216,14 +216,6 @@ begin
|
||||
end;
|
||||
|
||||
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := True;
|
||||
TerminatedSet;
|
||||
ThreadSwitch;
|
||||
end;
|
||||
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
begin
|
||||
Result := WaitForThreadTerminate (FHandle,0);
|
||||
|
@ -361,12 +361,6 @@ begin
|
||||
end;
|
||||
|
||||
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := True;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
begin
|
||||
WRITE_DEBUG('waiting for thread ',FHandle);
|
||||
|
@ -274,6 +274,12 @@ begin
|
||||
GetSuspended:=FSuspended;
|
||||
end;
|
||||
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := True;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
Procedure TThread.TerminatedSet;
|
||||
|
||||
begin
|
||||
|
@ -210,13 +210,6 @@ begin
|
||||
end;
|
||||
|
||||
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := true;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
var
|
||||
FH: cardinal;
|
||||
|
@ -97,13 +97,6 @@ begin
|
||||
end;
|
||||
|
||||
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := true;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
begin
|
||||
result := -1;
|
||||
|
@ -250,12 +250,6 @@ begin
|
||||
end;
|
||||
|
||||
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := True;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
begin
|
||||
WRITE_DEBUG('waiting for thread ',ptruint(FHandle));
|
||||
|
@ -97,13 +97,6 @@ begin
|
||||
end;
|
||||
|
||||
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := true;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
begin
|
||||
result := -1;
|
||||
|
@ -92,12 +92,6 @@ begin
|
||||
if ResumeThread(FHandle) = 1 then FSuspended := False;
|
||||
end;
|
||||
|
||||
procedure TThread.Terminate;
|
||||
begin
|
||||
FTerminated := True;
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
var
|
||||
Msg: TMsg;
|
||||
|
@ -71,13 +71,6 @@ begin
|
||||
end;
|
||||
|
||||
|
||||
procedure TThread.Terminate;
|
||||
|
||||
begin
|
||||
TerminatedSet;
|
||||
end;
|
||||
|
||||
|
||||
function TThread.WaitFor: Integer;
|
||||
|
||||
begin
|
||||
|
Loading…
Reference in New Issue
Block a user