paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-26 14:50:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

* avoid threadvar memory leaks for external hooked threads if the tlskey

Browse Source 
thread data is finalised by libpthread before the CleanupKey routine
    is called (based on patch by Derek, mantis #28806)

git-svn-id: trunk@32168 -
This commit is contained in:
Jonas Maebe 2015-10-27 21:52:05 +00:00
parent e2ed8f2251
commit f0c0b00467
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rtl/unix/cthreads.pp
View File

@ -176,11 +176,19 @@ Type PINTRTLEvent = ^TINTRTLEvent;
s := 'finishing externally started thread'#10; s := 'finishing externally started thread'#10;
fpwrite(0,s[1],length(s)); fpwrite(0,s[1],length(s));
{$endif DEBUG_MT} {$endif DEBUG_MT}
{ Restore tlskey value as it may already have been set to null,
in which case
a) DoneThread can't release the memory
b) accesses to threadvars from DoneThread or anything it
calls would allocate new threadvar memory
}
pthread_setspecific(tlskey,p);
{ clean up } { clean up }
DoneThread; DoneThread;
{ the pthread routine that calls us is supposed to do this, but doesn't { the pthread routine that calls us is supposed to do this, but doesn't
at least on Mac OS X 10.6 } at least on Mac OS X 10.6 }
pthread_setspecific(CleanupKey,nil); pthread_setspecific(CleanupKey,nil);
pthread_setspecific(tlskey,nil);
end; end;
@ -192,8 +200,12 @@ Type PINTRTLEvent = ^TINTRTLEvent;
{ we cannot know the stack size of the current thread, so pretend it { we cannot know the stack size of the current thread, so pretend it
is really large to prevent spurious stack overflow errors } is really large to prevent spurious stack overflow errors }
InitThread(1000000000); InitThread(1000000000);
{ instruct the pthreads system to clean up this thread when it exits } { instruct the pthreads system to clean up this thread when it exits.
pthread_setspecific(CleanupKey,pointer(1)); Use current tlskey as value so that if tlskey is cleared before
CleanupKey is called, we still know its value (the order in which
pthread tls data is zeroed by pthreads is undefined, and under some
systems the tlskey is cleared first) }
pthread_setspecific(CleanupKey,pthread_getspecific(tlskey));
end; end;