Quellcode durchsuchen

* 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 -

svenbarth vor 4 Jahren
Ursprung
Commit
11b601d44c

+ 0 - 6
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

+ 0 - 7
rtl/atari/tthread.inc

@@ -71,13 +71,6 @@ begin
 end;
 
 
-procedure TThread.Terminate;
-
-begin
-  TerminatedSet;
-end;
-
-
 function TThread.WaitFor: Integer;
 
 begin

+ 0 - 12
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);

+ 0 - 7
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;

+ 0 - 7
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;

+ 0 - 7
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;

+ 0 - 7
rtl/go32v2/tthread.inc

@@ -71,13 +71,6 @@ begin
 end;
 
 
-procedure TThread.Terminate;
-
-begin
-  TerminatedSet;
-end;
-
-
 function TThread.WaitFor: Integer;
 
 begin

+ 0 - 7
rtl/macos/tthread.inc

@@ -71,13 +71,6 @@ begin
 end;
 
 
-procedure TThread.Terminate;
-
-begin
-  TerminatedSet;
-end;
-
-
 function TThread.WaitFor: Integer;
 
 begin

+ 0 - 7
rtl/msdos/tthread.inc

@@ -71,13 +71,6 @@ begin
 end;
 
 
-procedure TThread.Terminate;
-
-begin
-  TerminatedSet;
-end;
-
-
 function TThread.WaitFor: Integer;
 
 begin

+ 0 - 6
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;

+ 0 - 7
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;

+ 0 - 8
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);

+ 0 - 6
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);

+ 6 - 0
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

+ 0 - 7
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;

+ 0 - 7
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;

+ 0 - 6
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));

+ 0 - 7
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;

+ 0 - 6
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;

+ 0 - 7
rtl/win16/tthread.inc

@@ -71,13 +71,6 @@ begin
 end;
 
 
-procedure TThread.Terminate;
-
-begin
-TerminatedSet;
-end;
-
-
 function TThread.WaitFor: Integer;
 
 begin