gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for recursive thread registration on one platform.

Browse source
This commit is contained in:
Richard Frith-Macdonald 2018-04-10 09:19:50 +01:00
parent 847c1a54b7
commit cc410b6bbc
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -1,5 +1,6 @@
2018-04-09 Richard Frith-Macdonald <rfm@gnu.org>
* Source/Additions/unicode/cop.h: Add comment/fixme
* Source/Additions/Unicode.m:
* Source/NSString.m:
Move uni_isnonsp() to NSString.m and make it use nonBaseCharacterSet

13
Source/NSThread.m
View file

@ -207,7 +207,7 @@ static int SetThreadName(DWORD dwThreadID, const char *threadName)
@interface NSThread (Activation)
- (void) _makeThreadActive;
- (void) _makeThreadCurrent;
@end
@interface NSAutoreleasePool (NSThread)
@ -766,6 +766,11 @@ gnustep_base_thread_callback(void)
@implementation NSThread (Activation)
- (void) _makeThreadActive
{
/* NB. We must set up the pointer to the new NSThread instance from
* pthread specific memory before we do anything which might need to
* check what the current thread is (like getting the ID)!
*/
pthread_setspecific(thread_object_key, self);
threadID = GSPrivateThreadID();
pthread_mutex_lock(&_activeLock);
/* The hash table is created lazily/late so that the NSThread
@ -790,8 +795,7 @@ gnustep_base_thread_callback(void)
static void
setThreadForCurrentThread(NSThread *t)
{
[t _makeThreadActive];
pthread_setspecific(thread_object_key, t);
[t _makeThreadCurrent];
gnustep_base_thread_callback();
}
@ -843,8 +847,7 @@ unregisterActiveThread(NSThread *thread)
{
t = [self new];
t->_active = YES;
[t _makeThreadActive];
pthread_setspecific(thread_object_key, t);
[t _makeThreadCurrent];
GS_CONSUMED(t);
if (defaultThread != nil && t != defaultThread)
{