gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 11:40:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Thread fixes.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@3131 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1998-10-27 14:59:05 +00:00
parent 2fa149743a
commit 1244cd5310
3 changed files with 194 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Source/NSDPSContext.m
View file

@ -60,20 +60,10 @@ NSString *DPSCantConnectException = @"DPSCantConnectException";
//
// Class variables
//
static NSMutableDictionary *GNU_CONTEXT_THREAD_DICT = nil;
static NSRecursiveLock *GNU_CONTEXT_LOCK = nil;
static NSString *GNU_CONTEXT_THREAD_KEY = @"GnuContextThreadKey";
static BOOL GNU_CONTEXT_TRACED = NO;
static BOOL GNU_CONTEXT_SYNCHRONIZED = NO;
#if defined(NeXT_PDO)
@implementation NSThread (Containers)
- copyWithZone:(NSZone*)zone
{
return [self retain];
}
@end
#endif
@implementation NSDPSContext
+ (void)initialize
@ -83,12 +73,6 @@ static BOOL GNU_CONTEXT_SYNCHRONIZED = NO;
// Set initial version
[self setVersion: 1];
// Allocate dictionary for maintaining
// mapping of threads to contexts
GNU_CONTEXT_THREAD_DICT = [NSMutableDictionary new];
// Create lock for serializing access to dictionary
GNU_CONTEXT_LOCK = [[NSRecursiveLock alloc] init];
GNU_CONTEXT_TRACED = NO;
GNU_CONTEXT_SYNCHRONIZED = NO;
}
@ -162,9 +146,8 @@ static BOOL GNU_CONTEXT_SYNCHRONIZED = NO;
current_thread = [NSThread currentThread];
// Get current context for current thread
[GNU_CONTEXT_LOCK lock];
current_context = [GNU_CONTEXT_THREAD_DICT objectForKey: current_thread];
current_context = [[current_thread threadDictionary] objectForKey: GNU_CONTEXT_THREAD_KEY];
// If not in dictionary then create one
if (!current_context)
@ -172,7 +155,6 @@ static BOOL GNU_CONTEXT_SYNCHRONIZED = NO;
current_context = [[NSDPSContext alloc] init];
[self setCurrentContext: current_context];
}
[GNU_CONTEXT_LOCK unlock];
return current_context;
}
@ -181,20 +163,15 @@ static BOOL GNU_CONTEXT_SYNCHRONIZED = NO;
{
NSThread *current_thread = [NSThread currentThread];
[GNU_CONTEXT_LOCK lock];
// If no context then remove from dictionary
if (!context)
{
[GNU_CONTEXT_THREAD_DICT removeObjectForKey: current_thread];
[[current_thread threadDictionary] removeObjectForKey: GNU_CONTEXT_THREAD_KEY];
}
else
{
[GNU_CONTEXT_THREAD_DICT setObject: context
forKey: current_thread];
[[current_thread threadDictionary] setObject: context forKey: GNU_CONTEXT_THREAD_KEY];
}
[GNU_CONTEXT_LOCK unlock];
}
- (NSDPSContext *)DPSContext