paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-13 18:24:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

* return thread function result via pthread_exit() from CBeginThread

Browse Source 
(Vinzent Hoefler)
  * simplified CWaitForThreadTerminate based on comments from Vinzent
    Hoefler
  * fixed resource leaks where in some cases a pthread would not be
    reaped based on comments from Vinzent Hoefler (resolves #9016)

git-svn-id: trunk@7588 -
This commit is contained in:
Jonas Maebe 2007-06-06 15:18:48 +00:00
parent af352cda24
commit 4dd3be0e5a
2 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rtl/unix/cthreads.pp
View File

@ -208,7 +208,7 @@ Type PINTRTLEvent = ^TINTRTLEvent;
{$endif DEBUG_MT} {$endif DEBUG_MT}
ThreadMain:=pointer(ti.f(ti.p)); ThreadMain:=pointer(ti.f(ti.p));
DoneThread; DoneThread;
pthread_exit(nil); pthread_exit(ThreadMain);
end; end;
@ -314,12 +314,9 @@ Type PINTRTLEvent = ^TINTRTLEvent;
function CWaitForThreadTerminate (threadHandle : TThreadID; TimeoutMs : longint) : dword; {0=no timeout} function CWaitForThreadTerminate (threadHandle : TThreadID; TimeoutMs : longint) : dword; {0=no timeout}
var var
LResultP: Pointer; LResultP: Pointer;
LResult: DWord;
begin begin
LResult := 0;
LResultP := @LResult;
pthread_join(pthread_t(threadHandle), @LResultP); pthread_join(pthread_t(threadHandle), @LResultP);
CWaitForThreadTerminate := LResult; CWaitForThreadTerminate := dword(LResultP);
end; end;
{$warning threadhandle can be larger than a dword} {$warning threadhandle can be larger than a dword}

39
rtl/unix/tthread.inc
View File

@ -121,9 +121,11 @@ begin
WRITE_DEBUG('Thread ',ptrint(lthread),' should be freed'); WRITE_DEBUG('Thread ',ptrint(lthread),' should be freed');
LThread.Free; LThread.Free;
WRITE_DEBUG('Thread freed'); WRITE_DEBUG('Thread freed');
// tthread.destroy already frees all things and terminates the thread WRITE_DEBUG('thread func calling EndThread');
// WRITE_DEBUG('thread func calling EndThread'); // we can never come here if the thread has already been joined, because
// EndThread(Result); // this function is the thread's main function (so it would have terminated
// already in case it was joined)
EndThread(Result);
end end
else else
begin begin
@ -144,6 +146,7 @@ begin
raise EThread.create('Semaphore init failed (possibly too many concurrent threads)'); raise EThread.create('Semaphore init failed (possibly too many concurrent threads)');
FSuspended := CreateSuspended; FSuspended := CreateSuspended;
FSuspendedExternal := false; FSuspendedExternal := false;
FThreadReaped := false;
FInitialSuspended := CreateSuspended; FInitialSuspended := CreateSuspended;
FFatalException := nil; FFatalException := nil;
WRITE_DEBUG('creating thread, self = ',longint(self)); WRITE_DEBUG('creating thread, self = ',longint(self));
@ -169,22 +172,33 @@ begin
inherited destroy; inherited destroy;
exit; exit;
end; end;
if (FThreadID = GetCurrentThreadID) and not(FFreeOnTerminate) and not FFinished then
raise EThreadDestroyCalled.Create('A thread cannot destroy itself except by setting FreeOnTerminate and leaving!');
// if someone calls .Free on a thread with // if someone calls .Free on a thread with
// FreeOnTerminate, then don't crash! // FreeOnTerminate, then don't crash!
FFreeOnTerminate := false; FFreeOnTerminate := false;
if not FFinished then if (FThreadID = GetCurrentThreadID) then
begin begin
Terminate; if not(FFreeOnTerminate) and not FFinished then
if (FInitialSuspended) then raise EThreadDestroyCalled.Create('A thread cannot destroy itself except by setting FreeOnTerminate and leaving!');
Resume; FFreeOnTerminate := false;
WaitFor; end
else
begin
{ you can't join yourself, so only for FThreadID<>GetCurrentThreadID }
{ and you can't join twice -> make sure we didn't join already }
if not FThreadReaped then
begin
Terminate;
if (FInitialSuspended) then
Resume;
WaitFor;
end;
end; end;
CurrentTM.SemaphoreDestroy(FSem); CurrentTM.SemaphoreDestroy(FSem);
FFatalException.Free; FFatalException.Free;
FFatalException := nil; FFatalException := nil;
{ threadvars have been released by cthreads.ThreadMain -> DoneThread } { threadvars have been released by cthreads.ThreadMain -> DoneThread, or }
{ or will be released (in case of FFreeOnTerminate) after this destructor }
{ has exited by ThreadFunc->EndThread->cthreads.CEndThread->DoneThread) }
inherited Destroy; inherited Destroy;
end; end;
@ -243,6 +257,9 @@ function TThread.WaitFor: Integer;
begin begin
WRITE_DEBUG('waiting for thread ',ptrint(FHandle)); WRITE_DEBUG('waiting for thread ',ptrint(FHandle));
WaitFor := WaitForThreadTerminate(FHandle, 0); WaitFor := WaitForThreadTerminate(FHandle, 0);
{ should actually check for errors in WaitForThreadTerminate, but no }
{ error api is defined for that function }
FThreadReaped:=true;
WRITE_DEBUG('thread terminated'); WRITE_DEBUG('thread terminated');
end; end;