From 11b601d44cfbcb80f32c6d83c90e678dbabcf711 Mon Sep 17 00:00:00 2001 From: svenbarth Date: Sat, 22 Aug 2020 15:56:13 +0000 Subject: [PATCH] * 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 - --- rtl/amicommon/tthread.inc | 6 ------ rtl/atari/tthread.inc | 7 ------- rtl/beos/tthread.inc | 12 ------------ rtl/embedded/tthread.inc | 7 ------- rtl/freertos/tthread.inc | 7 ------- rtl/gba/tthread.inc | 7 ------- rtl/go32v2/tthread.inc | 7 ------- rtl/macos/tthread.inc | 7 ------- rtl/msdos/tthread.inc | 7 ------- rtl/nativent/tthread.inc | 6 ------ rtl/nds/tthread.inc | 7 ------- rtl/netware/tthread.inc | 8 -------- rtl/netwlibc/tthread.inc | 6 ------ rtl/objpas/classes/classes.inc | 6 ++++++ rtl/os2/tthread.inc | 7 ------- rtl/symbian/tthread.inc | 7 ------- rtl/unix/tthread.inc | 6 ------ rtl/wii/tthread.inc | 7 ------- rtl/win/tthread.inc | 6 ------ rtl/win16/tthread.inc | 7 ------- 20 files changed, 6 insertions(+), 134 deletions(-) diff --git a/rtl/amicommon/tthread.inc b/rtl/amicommon/tthread.inc index dc3cc5ed0c..9fbb3a61da 100644 --- a/rtl/amicommon/tthread.inc +++ b/rtl/amicommon/tthread.inc @@ -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 diff --git a/rtl/atari/tthread.inc b/rtl/atari/tthread.inc index 17d9d92735..065e3ae4da 100644 --- a/rtl/atari/tthread.inc +++ b/rtl/atari/tthread.inc @@ -71,13 +71,6 @@ begin end; -procedure TThread.Terminate; - -begin - TerminatedSet; -end; - - function TThread.WaitFor: Integer; begin diff --git a/rtl/beos/tthread.inc b/rtl/beos/tthread.inc index 3ab4a4b5a2..9c74a149c8 100644 --- a/rtl/beos/tthread.inc +++ b/rtl/beos/tthread.inc @@ -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); diff --git a/rtl/embedded/tthread.inc b/rtl/embedded/tthread.inc index 6c18542b26..4324045019 100644 --- a/rtl/embedded/tthread.inc +++ b/rtl/embedded/tthread.inc @@ -97,13 +97,6 @@ begin end; -procedure TThread.Terminate; -begin - FTerminated := true; - TerminatedSet; -end; - - function TThread.WaitFor: Integer; begin result := -1; diff --git a/rtl/freertos/tthread.inc b/rtl/freertos/tthread.inc index 71df157744..4324045019 100644 --- a/rtl/freertos/tthread.inc +++ b/rtl/freertos/tthread.inc @@ -97,13 +97,6 @@ begin end; -procedure TThread.Terminate; -begin - FTerminated := true; - TerminatedSet; -end; - - function TThread.WaitFor: Integer; begin result := -1; diff --git a/rtl/gba/tthread.inc b/rtl/gba/tthread.inc index 71df157744..4324045019 100644 --- a/rtl/gba/tthread.inc +++ b/rtl/gba/tthread.inc @@ -97,13 +97,6 @@ begin end; -procedure TThread.Terminate; -begin - FTerminated := true; - TerminatedSet; -end; - - function TThread.WaitFor: Integer; begin result := -1; diff --git a/rtl/go32v2/tthread.inc b/rtl/go32v2/tthread.inc index 17d9d92735..065e3ae4da 100644 --- a/rtl/go32v2/tthread.inc +++ b/rtl/go32v2/tthread.inc @@ -71,13 +71,6 @@ begin end; -procedure TThread.Terminate; - -begin - TerminatedSet; -end; - - function TThread.WaitFor: Integer; begin diff --git a/rtl/macos/tthread.inc b/rtl/macos/tthread.inc index 17d9d92735..065e3ae4da 100644 --- a/rtl/macos/tthread.inc +++ b/rtl/macos/tthread.inc @@ -71,13 +71,6 @@ begin end; -procedure TThread.Terminate; - -begin - TerminatedSet; -end; - - function TThread.WaitFor: Integer; begin diff --git a/rtl/msdos/tthread.inc b/rtl/msdos/tthread.inc index 17d9d92735..065e3ae4da 100644 --- a/rtl/msdos/tthread.inc +++ b/rtl/msdos/tthread.inc @@ -71,13 +71,6 @@ begin end; -procedure TThread.Terminate; - -begin - TerminatedSet; -end; - - function TThread.WaitFor: Integer; begin diff --git a/rtl/nativent/tthread.inc b/rtl/nativent/tthread.inc index 018e763d2c..4005b7033c 100644 --- a/rtl/nativent/tthread.inc +++ b/rtl/nativent/tthread.inc @@ -45,12 +45,6 @@ procedure TThread.Resume; begin end; -procedure TThread.Terminate; -begin - FTerminated := True; - TerminatedSet; -end; - function TThread.WaitFor: Integer; begin Result := -1; diff --git a/rtl/nds/tthread.inc b/rtl/nds/tthread.inc index fc5096ebd2..7fcf67d395 100644 --- a/rtl/nds/tthread.inc +++ b/rtl/nds/tthread.inc @@ -97,13 +97,6 @@ begin end; -procedure TThread.Terminate; -begin - FTerminated := true; - TerminatedSet; -end; - - function TThread.WaitFor: Integer; begin result := -1; diff --git a/rtl/netware/tthread.inc b/rtl/netware/tthread.inc index 679638f1f9..625fcb84db 100644 --- a/rtl/netware/tthread.inc +++ b/rtl/netware/tthread.inc @@ -216,14 +216,6 @@ begin end; -procedure TThread.Terminate; -begin - FTerminated := True; - TerminatedSet; - ThreadSwitch; -end; - - function TThread.WaitFor: Integer; begin Result := WaitForThreadTerminate (FHandle,0); diff --git a/rtl/netwlibc/tthread.inc b/rtl/netwlibc/tthread.inc index 5b54483bcf..033c024e22 100644 --- a/rtl/netwlibc/tthread.inc +++ b/rtl/netwlibc/tthread.inc @@ -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); diff --git a/rtl/objpas/classes/classes.inc b/rtl/objpas/classes/classes.inc index 96a88da9a8..071b9ed56f 100644 --- a/rtl/objpas/classes/classes.inc +++ b/rtl/objpas/classes/classes.inc @@ -274,6 +274,12 @@ begin GetSuspended:=FSuspended; end; +procedure TThread.Terminate; +begin + FTerminated := True; + TerminatedSet; +end; + Procedure TThread.TerminatedSet; begin diff --git a/rtl/os2/tthread.inc b/rtl/os2/tthread.inc index 0c41028183..926fadb080 100644 --- a/rtl/os2/tthread.inc +++ b/rtl/os2/tthread.inc @@ -210,13 +210,6 @@ begin end; -procedure TThread.Terminate; -begin - FTerminated := true; - TerminatedSet; -end; - - function TThread.WaitFor: Integer; var FH: cardinal; diff --git a/rtl/symbian/tthread.inc b/rtl/symbian/tthread.inc index 71df157744..4324045019 100644 --- a/rtl/symbian/tthread.inc +++ b/rtl/symbian/tthread.inc @@ -97,13 +97,6 @@ begin end; -procedure TThread.Terminate; -begin - FTerminated := true; - TerminatedSet; -end; - - function TThread.WaitFor: Integer; begin result := -1; diff --git a/rtl/unix/tthread.inc b/rtl/unix/tthread.inc index 984dd46a61..f6ee9b1dba 100644 --- a/rtl/unix/tthread.inc +++ b/rtl/unix/tthread.inc @@ -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)); diff --git a/rtl/wii/tthread.inc b/rtl/wii/tthread.inc index 6c18542b26..4324045019 100644 --- a/rtl/wii/tthread.inc +++ b/rtl/wii/tthread.inc @@ -97,13 +97,6 @@ begin end; -procedure TThread.Terminate; -begin - FTerminated := true; - TerminatedSet; -end; - - function TThread.WaitFor: Integer; begin result := -1; diff --git a/rtl/win/tthread.inc b/rtl/win/tthread.inc index 9e7c039ff5..1133175608 100644 --- a/rtl/win/tthread.inc +++ b/rtl/win/tthread.inc @@ -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; diff --git a/rtl/win16/tthread.inc b/rtl/win16/tthread.inc index b46781cf55..065e3ae4da 100644 --- a/rtl/win16/tthread.inc +++ b/rtl/win16/tthread.inc @@ -71,13 +71,6 @@ begin end; -procedure TThread.Terminate; - -begin -TerminatedSet; -end; - - function TThread.WaitFor: Integer; begin