gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-06-02 01:21:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

iCreate mapt able lazily

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@39382 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2016-02-16 22:28:34 +00:00
parent 3ad666129f
commit 64628b992b
1 changed files with 32 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Source/NSThread.m
View file

@ -503,7 +503,7 @@ static const NSMapTableKeyCallBacks _boxedPthreadKeyCallBacks =
* cleanup. This is a required so that +currentThread can still find the * cleanup. This is a required so that +currentThread can still find the
* thred if called from within the late-cleanup function. * thred if called from within the late-cleanup function.
*/ */
static NSMapTable *_exitingThreads; static NSMapTable *_exitingThreads = nil;
static NSLock *_exitingThreadsLock; static NSLock *_exitingThreadsLock;
/** /**
@ -518,6 +518,15 @@ static inline void _willLateUnregisterThread(NSValue *boxedThread,
[_exitingThreadsLock lock]; [_exitingThreadsLock lock];
NS_DURING NS_DURING
{ {
/* The map table is created lazily/late so that the NSThread
* +initilize method can be called without causing other
* classes to be initialized.
*/
if (nil == _exitingThreads)
{
_exitingThreads = NSCreateMapTable(_boxedPthreadKeyCallBacks,
NSObjectMapValueCallBacks, 10);
}
NSMapInsert(_exitingThreads, (const void*)boxedThread, NSMapInsert(_exitingThreads, (const void*)boxedThread,
(const void*)specific); (const void*)specific);
} }
@ -538,16 +547,19 @@ static inline void _willLateUnregisterThread(NSValue *boxedThread,
static inline void _didLateUnregisterCurrentThread(NSValue *boxedThread) static inline void _didLateUnregisterCurrentThread(NSValue *boxedThread)
{ {
[_exitingThreadsLock lock]; [_exitingThreadsLock lock];
NS_DURING if (nil != _exitingThreads)
{ {
NSMapRemove(_exitingThreads, (const void*)boxedThread); NS_DURING
{
NSMapRemove(_exitingThreads, (const void*)boxedThread);
}
NS_HANDLER
{
[_exitingThreadsLock unlock];
[localException raise];
}
NS_ENDHANDLER
} }
NS_HANDLER
{
[_exitingThreadsLock unlock];
[localException raise];
}
NS_ENDHANDLER
[_exitingThreadsLock unlock]; [_exitingThreadsLock unlock];
} }
@ -622,9 +634,12 @@ GSCurrentThread(void)
* because the exception handler stores information in the current * because the exception handler stores information in the current
* thread variables ... which causes recursion. * thread variables ... which causes recursion.
*/ */
[_exitingThreadsLock lock]; if (nil != _exitingThreads)
thr = NSMapGet(_exitingThreads, (const void*)selfThread); {
[_exitingThreadsLock unlock]; [_exitingThreadsLock lock];
thr = NSMapGet(_exitingThreads, (const void*)selfThread);
[_exitingThreadsLock unlock];
}
DESTROY(selfThread); DESTROY(selfThread);
} }
if (nil == thr) if (nil == thr)
@ -847,15 +862,15 @@ unregisterActiveThread(NSThread *thread)
[NSException raise: NSInternalInconsistencyException [NSException raise: NSInternalInconsistencyException
format: @"Unable to create thread key!"]; format: @"Unable to create thread key!"];
} }
/* /* Ensure that the default thread exists.
* Ensure that the default thread exists. * It's safe to create a lock here (since [NSObject+initialize]
* creates locks, and locks don't depend on any other class),
* but we want to avoid initialising other classes while we are
* initialising NSThread.
*/ */
threadClass = self; threadClass = self;
_exitingThreads = NSCreateMapTable(_boxedPthreadKeyCallBacks,
NSObjectMapValueCallBacks, 10);
_exitingThreadsLock = [NSLock new]; _exitingThreadsLock = [NSLock new];
GSCurrentThread(); GSCurrentThread();
} }
} }