gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 16:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Thread safety fixup

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@23408 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2006-09-07 11:47:45 +00:00
parent 23e7050f72
commit a94904a806
3 changed files with 44 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Source/NSObject.m
View file

@ -65,6 +65,20 @@
extern BOOL __objc_responds_to(id, SEL);
#endif
/* When this is `YES', every call to release/autorelease, checks to
make sure isn't being set up to release itself too many times.
This does not need mutex protection. */
static BOOL double_release_check_enabled = NO;
/* The Class responsible for handling autorelease's. This does not
need mutex protection, since it is simply a pointer that gets read
and set. */
static id autorelease_class = nil;
static SEL autorelease_sel;
static IMP autorelease_imp;
#if GS_WITH_GC
#include <gc.h>
@ -242,12 +256,21 @@ static GSIMapTable_t retain_counts = {0};
* (and hence whether the extra reference count was decremented).<br />
* This function is used by the [NSObject-release] method.
*/
inline BOOL
BOOL
NSDecrementExtraRefCountWasZero(id anObject)
{
#if GS_WITH_GC
return NO;
#else /* GS_WITH_GC */
if (double_release_check_enabled)
{
unsigned release_count;
unsigned retain_count = [anObject retainCount];
release_count = [autorelease_class autoreleaseCountForObject: anObject];
if (release_count >= retain_count)
[NSException raise: NSGenericException
format: @"Release would release object too many times."];
}
#if defined(REFCNT_LOCAL)
if (allocationLock != 0)
{
@ -696,20 +719,6 @@ NSShouldRetainWithZone (NSObject *anObject, NSZone *requestedZone)
/* The Class responsible for handling autorelease's. This does not
need mutex protection, since it is simply a pointer that gets read
and set. */
static id autorelease_class = nil;
static SEL autorelease_sel;
static IMP autorelease_imp;
/* When this is `YES', every call to release/autorelease, checks to
make sure isn't being set up to release itself too many times.
This does not need mutex protection. */
static BOOL double_release_check_enabled = NO;
struct objc_method_description_list {
int count;
struct objc_method_description list[1];
@ -1828,16 +1837,6 @@ GSDescriptionForClassMethod(pcl self, SEL aSel)
- (oneway void) release
{
#if GS_WITH_GC == 0
if (double_release_check_enabled)
{
unsigned release_count;
unsigned retain_count = [self retainCount];
release_count = [autorelease_class autoreleaseCountForObject:self];
if (release_count >= retain_count)
[NSException raise: NSGenericException
format: @"Release would release object too many times."];
}
if (NSDecrementExtraRefCountWasZero(self))
{
[self dealloc];