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

merge back reorganisation branch

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29615 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2010-02-14 10:48:10 +00:00
parent d0b66e510d
commit f13d56d8ec
263 changed files with 5577 additions and 4170 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Source/NSLock.m
View file

@ -31,6 +31,10 @@
#import "GNUstepBase/GSConfig.h"
#define gs_cond_t pthread_cond_t
#define gs_mutex_t pthread_mutex_t
#define EXPOSE_NSLock_IVARS 1
#define EXPOSE_NSRecursiveLock_IVARS 1
#define EXPOSE_NSCondition_IVARS 1
#define EXPOSE_NSConditionLock_IVARS 1
#import "Foundation/NSLock.h"
#include <math.h>
#include <errno.h>
@ -88,7 +92,7 @@
}\
if (EDEADLK == err)\
{\
_NSLockError(self, _cmd);\
_NSLockError(self, _cmd, YES);\
}\
}
#define MLOCKBEFOREDATE \
@ -129,12 +133,13 @@ static pthread_mutexattr_t attr_recursive;
/*
* OS X 10.5 compatibility function to allow debugging deadlock conditions.
*/
void _NSLockError(id obj, SEL _cmd)
void _NSLockError(id obj, SEL _cmd, BOOL stop)
{
NSLog(@"*** -[%@ %@]: deadlock (%@)", [obj class],
NSStringFromSelector(_cmd), obj);
NSLog(@"*** Break on _NSLockError() to debug.");
pthread_mutex_lock(&deadlock);
if (YES == stop)
pthread_mutex_lock(&deadlock);
}
// Exceptions
@ -200,7 +205,25 @@ MFINALIZE
}
MLOCK
MLOCKBEFOREDATE
- (BOOL) lockBeforeDate: (NSDate*)limit
{
do
{
int err = pthread_mutex_trylock(&_mutex);
if (0 == err)
{
return YES;
}
if (EDEADLK == err)
{
_NSLockError(self, _cmd, NO);
}
sched_yield();
} while([limit timeIntervalSinceNow] < 0);
return NO;
}
MNAME
MTRYLOCK
MUNLOCK