gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

NSCalendarDate.m - dateByAddingYears lost timezone info.

Browse source 
- initWithString didn't deal with adjacent format
                   specifiers.

NSDate.m         - addTimeInterval messed up timezone if used with
                   CalendarDate.

NSArray.m        - NSMutableArray's comparered against a garbage pointer
NSGArray.m         on removal.  This causes real problems on SMP machines.

NSTimeZone.m     - The GMT+-xx files on OpenStep are in the root directory
                   and they are in Etc/* in gnustep so check both.

NSObject.m       - The release code was slightly broken for SMP machine
                   use.

NSLock.m         - Trylock was broken and lockBeforeDate unimplemented.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@5436 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Chris Ball 1999-12-10 00:59:40 +00:00
parent 0761b6ee95
commit f2ba659be3
7 changed files with 479 additions and 291 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Source/NSArray.m
View file

@ -900,6 +900,11 @@ static NSString *indentStrings[] = {
if (rem == 0)
rem = [self methodForSelector: remSel];
(*rem)(self, remSel, i);
/*
* Bail out now or run the risk of comparing against a garbage
* pointer.
*/
return;
}
}
}
@ -939,6 +944,11 @@ static NSString *indentStrings[] = {
if (rem == 0)
rem = [self methodForSelector: remSel];
(*rem)(self, remSel, i);
/*
* Bail out now or run the risk of comparing against a garbage
* pointer.
*/
return;
}
}
}
@ -976,6 +986,11 @@ static NSString *indentStrings[] = {
if (rem == 0)
rem = [self methodForSelector: remSel];
(*rem)(self, remSel, i);
/*
* Bail out now or run the risk of comparing against a garbage
* pointer.
*/
return;
}
}
}
@ -1007,6 +1022,11 @@ static NSString *indentStrings[] = {
if (rem == 0)
rem = [self methodForSelector: remSel];
(*rem)(self, remSel, i);
/*
* Bail out now or run the risk of comparing against a garbage
* pointer.
*/
return;
}
}
}

588
Source/NSCalendarDate.m
View file

@ -169,48 +169,57 @@
locale: nil];
}
/*
* This function could possibly be written better
* but it works ok; currently ignores locale
* information and some specifiers.
*/
- (id) initWithString: (NSString *)description
calendarFormat: (NSString *)format
locale: (NSDictionary *)locale
{
const char *d = [description cString];
const char *f = [format cString];
char *newf;
int lf = strlen(f);
BOOL mtag = NO, dtag = NO, ycent = NO;
BOOL fullm = NO;
char ms[80] = "", ds[80] = "", timez[80] = "", ampm[80] = "";
int tznum = 0;
int yd = 0, md = 0, dd = 0, hd = 0, mnd = 0, sd = 0;
void *pntr[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
int order;
int yord = 0, mord = 0, dord = 0, hord = 0, mnord = 0, sord = 0, tzord = 0;
int ampmord = 0;
int i;
NSTimeZone *tz;
BOOL zoneByAbbreviation = YES;
// If either the string or format is nil then raise exception
if (!description)
[NSException raise: NSInvalidArgumentException
format: @"NSCalendar date description is nil"];
- (id) initWithString: (NSString *)description
calendarFormat: (NSString *)fmt
locale: (NSDictionary *)locale
{
int year = 0, month = 1, day = 1, hour = 0, min = 0, sec = 0;
NSTimeZone *tz = [NSTimeZone localTimeZone];
int ampm = 0, twelveHrClock = 0;
int julianWeeks = -1, weekStartsMonday = 0, dayOfWeek = -1;
const char *source = [description cString];
int sourceLen = strlen(source);
const char *format = [fmt cString];
int formatLen = strlen(format);
int formatIdx = 0;
int sourceIdx = 0;
char tmpStr[20];
int tmpIdx;
if (locale == nil)
locale = [[NSUserDefaults standardUserDefaults] dictionaryRepresentation];
if (format == nil)
format = [locale objectForKey: NSTimeDateFormatString];
{
locale = [[NSUserDefaults standardUserDefaults] dictionaryRepresentation];
}
if (fmt == nil)
{
format = [[locale objectForKey: NSTimeDateFormatString] cString];
formatLen = strlen(format);
}
// The strftime specifiers
//
// WARNING:
// -%c, %F, %x, %X do NOT work. (NSTimeDateFormatString isn't defined and
// the underlying call has granularity to the second.
// -Most locale stuff is dubious at best.
// -Long day and month names depend on a non-alpha character after the last
// digit to work.
//
// The strftime specifiers as used by OpenStep + %U.
//
// %% literal % character
// %a abbreviated weekday name according to locale
// %A full weekday name according to locale
// %b abbreviated month name according to locale
// %B full month name according to locale
// %c same as '%X %x'
// %d day of month as decimal number
// %e same as %d without leading zero (you get a leading space instead)
// %F milliseconds as a decimal number
// %H hour as a decimal number using 24-hour clock
// %I hour as a decimal number using 12-hour clock
// %j day of year as a decimal number
@ -221,253 +230,308 @@
// %U week of the current year as decimal number (Sunday first day)
// %W week of the current year as decimal number (Monday first day)
// %w day of the week as decimal number (Sunday = 0)
// %y year as a decimal number without century
// %x date with date representation for locale
// %X time with time representation for locale
// %y year as a decimal number without century
// %Y year as a decimal number with century
// %Z time zone
// %% literal % character
// Find the order of date elements
// and translate format string into scanf ready string
order = 1;
newf = NSZoneMalloc(NSDefaultMallocZone(), lf+1);
for (i = 0;i < lf; ++i)
{
newf[i] = f[i];
// Only care about a format specifier
if (f[i] == '%')
// %z time zone offset in hours and minutes from GMT (HHMM)
// %Z time zone abbreviation
while ( formatIdx < formatLen )
{
// check the character that comes after
switch (f[i+1])
{
// skip literal %
case '%':
++i;
newf[i] = f[i];
break;
// is it the year
case 'Y':
ycent = YES;
case 'y':
yord = order;
++order;
++i;
newf[i] = 'd';
pntr[yord] = (void *)&yd;
break;
// is it the month
case 'B':
fullm = YES; // Full month name
case 'b':
mtag = YES; // Month is character string
case 'm':
mord = order;
++order;
++i;
if (mtag)
if ( format[formatIdx] != '%' )
{
newf[i] = 's';
pntr[mord] = (void *)ms;
}
else
{
newf[i] = 'd';
pntr[mord] = (void *)&md;
}
break;
// If it's not a format specifier, ignore it.
sourceIdx++;
} else {
// is it the day
case 'a':
case 'A':
dtag = YES; // Day is character string
case 'd':
case 'j':
case 'w':
dord = order;
++order;
++i;
if (dtag)
{
newf[i] = 's';
pntr[dord] = (void *)ds;
}
else
{
newf[i] = 'd';
pntr[dord] = (void *)&dd;
}
break;
// Skip '%'
formatIdx++;
// is it the hour
case 'H':
case 'I':
hord = order;
++order;
++i;
newf[i] = 'd';
pntr[hord] = (void *)&hd;
break;
switch (format[formatIdx])
{
case '%':
// skip literal %
sourceIdx++;
break;
// is it the minute
case 'M':
mnord = order;
++order;
++i;
newf[i] = 'd';
pntr[mnord] = (void *)&mnd;
break;
case 'a':
// Are Short names three chars in all locales?????
tmpStr[0] = toupper( source[sourceIdx++] );
tmpStr[1] = tolower( source[sourceIdx++] );
tmpStr[2] = tolower( source[sourceIdx++] );
tmpStr[3] = '\0';
{
NSString *currDay = [NSString stringWithCString: tmpStr];
NSArray *dayNames = [locale objectForKey: NSShortWeekDayNameArray];
// is it the second
case 'S':
sord = order;
++order;
++i;
newf[i] = 'd';
pntr[sord] = (void *)&sd;
break;
for (tmpIdx = 0; tmpIdx < 7; tmpIdx++)
if ([[dayNames objectAtIndex: tmpIdx] isEqual: currDay] == YES)
break;
dayOfWeek = tmpIdx;
}
break;
// the time zone abbreviation
case 'Z':
tzord = order;
++order;
++i;
newf[i] = 's';
pntr[tzord] = (void *)timez;
break;
case 'A':
for ( tmpIdx = sourceIdx; tmpIdx < sourceLen; tmpIdx++ )
{
if ( isalpha( source[tmpIdx] ) )
{
tmpStr[tmpIdx - sourceIdx] = source[tmpIdx];
} else {
break;
}
}
tmpStr[tmpIdx - sourceIdx] = '\0';
sourceIdx += tmpIdx - sourceIdx;
{
NSString *currDay = [NSString stringWithCString: tmpStr];
NSArray *dayNames = [locale objectForKey: NSWeekDayNameArray];
// the time zone in numeric format
case 'z':
tzord = order;
++order;
++i;
newf[i] = 'd';
pntr[tzord] = (void *)&tznum;
zoneByAbbreviation = NO;
break;
for (tmpIdx = 0; tmpIdx < 7; tmpIdx++)
if ([[dayNames objectAtIndex: tmpIdx] isEqual: currDay] == YES)
break;
dayOfWeek = tmpIdx;
}
break;
// AM PM indicator
case 'p':
ampmord = order;
++order;
++i;
newf[i] = 's';
pntr[ampmord] = (void *)ampm;
break;
case 'b':
// Are Short names three chars in all locales?????
tmpStr[0] = toupper( source[sourceIdx++] );
tmpStr[1] = tolower( source[sourceIdx++] );
tmpStr[2] = tolower( source[sourceIdx++] );
tmpStr[3] = '\0';
{
NSString *currMonth = [NSString stringWithCString: tmpStr];
NSArray *monthNames = [locale objectForKey: NSShortMonthNameArray];
// Anything else is an invalid format
default:
free(newf);
[NSException raise: NSInvalidArgumentException
format: @"Invalid NSCalendar date, specifier %c not recognized in format %s", f[i+1], f];
}
for (tmpIdx = 0; tmpIdx < 12; tmpIdx++)
{
if ([[monthNames objectAtIndex: tmpIdx] isEqual: currMonth] == YES)
break;
}
month = tmpIdx+1;
}
break;
case 'B':
for ( tmpIdx = sourceIdx; tmpIdx < sourceLen; tmpIdx++ )
{
if ( isalpha( source[tmpIdx] ) )
{
tmpStr[tmpIdx - sourceIdx] = source[tmpIdx];
} else {
break;
}
}
tmpStr[tmpIdx - sourceIdx] = '\0';
sourceIdx += tmpIdx - sourceIdx;
{
NSString *currMonth = [NSString stringWithCString: tmpStr];
NSArray *monthNames = [locale objectForKey: NSMonthNameArray];
for (tmpIdx = 0; tmpIdx < 12; tmpIdx++)
if ([[monthNames objectAtIndex: tmpIdx] isEqual: currMonth] == YES)
break;
month = tmpIdx+1;
}
break;
// case 'c':
// break;
case 'd': // fall through
case 'e':
memcpy( tmpStr, &source[sourceIdx], 2 );
tmpStr[2] = '\0';
sourceIdx += 2;
day = atoi( tmpStr );
break;
// case 'F':
// break;
case 'I': // fall through
twelveHrClock = 1;
case 'H':
memcpy( tmpStr, &source[sourceIdx], 2 );
tmpStr[2] = '\0';
sourceIdx += 2;
hour = atoi( tmpStr );
break;
case 'j':
memcpy( tmpStr, &source[sourceIdx], 3 );
tmpStr[3] = '\0';
sourceIdx += 3;
day = atoi( tmpStr );
break;
case 'm':
memcpy( tmpStr, &source[sourceIdx], 2 );
tmpStr[2] = '\0';
sourceIdx += 2;
month = atoi( tmpStr );
break;
case 'M':
memcpy( tmpStr, &source[sourceIdx], 2 );
tmpStr[2] = '\0';
sourceIdx += 2;
min = atoi( tmpStr );
break;
case 'p':
// Questionable assumption that all am/pm indicators are 2
// characters and in upper case....
tmpStr[0] = toupper( source[sourceIdx++] );
tmpStr[1] = toupper( source[sourceIdx++] );
tmpStr[2] = '\0';
{
NSString *currAMPM = [NSString stringWithCString: tmpStr];
NSArray *amPMNames = [locale objectForKey: NSAMPMDesignation];
/*
* The time addition is handled below because this
* indicator only modifies the time on a 12hour clock.
*/
if ([[amPMNames objectAtIndex: 1] isEqual: currAMPM] == YES)
ampm = 1;
}
break;
case 'S':
memcpy( tmpStr, &source[sourceIdx], 2 );
tmpStr[2] = '\0';
sourceIdx += 2;
sec = atoi( tmpStr );
break;
case 'w':
tmpStr[0] = source[sourceIdx++];
tmpStr[1] = '\0';
dayOfWeek = atoi( tmpStr );
break;
case 'W': // Fall through
weekStartsMonday = 1;
case 'U':
memcpy( tmpStr, &source[sourceIdx], 2 );
tmpStr[2] = '\0';
sourceIdx += 2;
julianWeeks = atoi( tmpStr );
break;
// case 'x':
// break;
// case 'X':
// break;
case 'y':
memcpy( tmpStr, &source[sourceIdx], 2 );
tmpStr[2] = '\0';
sourceIdx += 2;
year = atoi( tmpStr );
if ( year >= 70 )
{
year += 1900;
} else {
year += 2000;
}
break;
case 'Y':
memcpy( tmpStr, &source[sourceIdx], 4 );
tmpStr[4] = '\0';
sourceIdx += 4;
year = atoi( tmpStr );
break;
case 'z':
tmpStr[0] = toupper( source[sourceIdx++] );
tmpStr[1] = tolower( source[sourceIdx++] );
tmpStr[2] = tolower( source[sourceIdx++] );
tmpStr[3] = tolower( source[sourceIdx++] );
tmpStr[4] = '\0';
{
int zone;
zone = atoi( tmpStr );
if ((tz = [NSTimeZone timeZoneForSecondsFromGMT:
(zone / 100 * 60 + (zone % 100) ) * 60] ) == nil )
{
tz = [NSTimeZone localTimeZone];
}
}
break;
case 'Z':
for ( tmpIdx = sourceIdx; tmpIdx < sourceLen; tmpIdx++ )
{
if ( isalpha( source[tmpIdx] ) || source[tmpIdx] == '-' || source[tmpIdx] == '+' )
{
tmpStr[tmpIdx - sourceIdx] = source[tmpIdx];
} else {
break;
}
}
tmpStr[tmpIdx - sourceIdx] = '\0';
sourceIdx += tmpIdx - sourceIdx;
{
if ( (tz = [NSTimeZone timeZoneWithAbbreviation:
[NSString stringWithCString: tmpStr]]) == nil)
{
tz = [NSTimeZone localTimeZone];
}
}
break;
default:
[NSException raise: NSInvalidArgumentException
format: @"Invalid NSCalendar date, specifier %c not recognized in format %s",
format[formatIdx], format];
}
}
formatIdx++;
}
}
newf[lf] = '\0';
// Have sscanf parse and retrieve the values for us
if (order != 1)
sscanf(d, newf, pntr[1], pntr[2], pntr[3], pntr[4], pntr[5], pntr[6],
pntr[7], pntr[8], pntr[9]);
else
// nothing in the string?
;
if ( twelveHrClock )
{
if ( ampm && hour != 12 )
{
hour += 12;
}
}
// Put century on year if need be
// +++ How do we be year 2000 compliant?
if (!ycent)
yd += 1900;
if ( julianWeeks != -1 )
{
int currDay = [[[[NSCalendarDate alloc] initWithYear: year month: 1 day: 1 hour: 0 minute: 0
second: 0 timeZone: [NSTimeZone timeZoneForSecondsFromGMT: 0]] autorelease] dayOfWeek];
// Possibly convert month from string to decimal number
if (mtag)
{
int i;
NSString *m = [NSString stringWithCString: ms];
/*
* The julian weeks are either sunday relative or monday relative but all
* of the day of week specifiers are sunday relative. This means that if
* no day of week specifier was used the week starts on monday.
*/
if ( dayOfWeek == -1 )
{
if ( weekStartsMonday )
{
dayOfWeek = 1;
} else {
dayOfWeek = 0;
}
}
day = dayOfWeek + (julianWeeks * 7 - (currDay - 1));
}
if (fullm)
{
NSArray *names = [locale objectForKey: NSMonthNameArray];
for (i = 0;i < 12; ++i)
if ([[names objectAtIndex: i] isEqual: m] == YES)
break;
}
else
{
NSArray *names = [locale objectForKey: NSShortMonthNameArray];
for (i = 0;i < 12; ++i)
if ([[names objectAtIndex: i] isEqual: m] == YES)
break;
}
md = i + 1;
}
// Possibly convert day from string to decimal number
// +++ how do we take locale into account?
if (dtag)
{
}
// +++ We need to take 'am' and 'pm' into account
if (ampmord)
{
// If its PM then we shift
if ((ampm[0] == 'p') || (ampm[0] == 'P'))
{
// 12pm is 12pm not 24pm
if (hd != 12)
hd += 12;
}
}
// +++ then there is the time zone
if (tzord)
{
if (zoneByAbbreviation)
{
tz = [NSTimeZone timeZoneWithAbbreviation:
[NSString stringWithCString: timez]];
if (!tz)
{
tz = [NSTimeZone localTimeZone];
}
}
else
{
int tzm, tzh, sign;
if (tznum < 0)
{
sign = -1;
tznum = -tznum;
}
else
{
sign = 1;
}
tzm = tznum % 100;
tzh = tznum / 100;
tz = [NSTimeZone timeZoneForSecondsFromGMT: (tzh*60 + tzm)*60*sign];
if (!tz)
{
tz = [NSTimeZone localTimeZone];
}
}
}
else
{
tz = [NSTimeZone localTimeZone];
}
NSZoneFree(NSDefaultMallocZone(), newf);
return [self initWithYear: yd month: md day: dd hour: hd
minute: mnd second: sd
return [[NSCalendarDate alloc] initWithYear: year month: month day: day hour: hour
minute: min second: sec
timeZone: tz];
}
- (id) initWithYear: (int)year
month: (unsigned int)month
day: (unsigned int)day
@ -1252,7 +1316,7 @@
hour: hour
minute: minute
second: second
timeZone: nil];
timeZone: [self timeZoneDetail]];
}
- (void) years: (int*)years

9
Source/NSDate.m
View file

@ -1118,8 +1118,13 @@ GSTimeNow()
- (id) addTimeInterval: (NSTimeInterval)seconds
{
/* xxx We need to check for overflow? */
return [concreteClass dateWithTimeIntervalSinceReferenceDate:
_seconds_since_ref + seconds];
id newObj = [[self class] dateWithTimeIntervalSinceReferenceDate:
_seconds_since_ref + seconds];
if ([self isKindOfClass: [NSCalendarDate class]])
[newObj setTimeZone: [(NSCalendarDate *) self timeZoneDetail]];
return newObj;
}
- (NSTimeInterval) timeIntervalSince1970

10
Source/NSGArray.m
View file

@ -450,6 +450,11 @@ static SEL eqSel = @selector(isEqual:);
}
_count--;
RELEASE(obj);
/*
* Bail out now or run the risk of comparing against a garbage
* pointer.
*/
return;
}
}
}
@ -500,6 +505,11 @@ static SEL eqSel = @selector(isEqual:);
}
_count--;
RELEASE(obj);
/*
* Bail out now or run the risk of comparing against a garbage
* pointer.
*/
return;
}
}
}

100
Source/NSLock.m
View file

@ -1,5 +1,5 @@
/* Mutual exclusion locking classes
Copyright (C) 1996 Free Software Foundation< Inc.
Copyright (C) 1996 Free Software Foundation, Inc.
Author: Scott Christley <scottc@net-community.com>
Created: 1996
@ -9,7 +9,7 @@
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License< or (at your option) any later version.
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@ -17,12 +17,13 @@
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; if not< write to the Free
Software Foundation< Inc.< 59 Temple Place< Suite 330< Boston< MA 02111 USA.
License along with this library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
*/
#include <config.h>
#include <errno.h>
#include <unistd.h>
#include <base/preface.h>
#include <Foundation/NSLock.h>
#include <Foundation/NSException.h>
@ -94,19 +95,52 @@ NSString *NSRecursiveLockException = @"NSRecursiveLockException";
// Does not block
- (BOOL) tryLock
{
CHECK_RECURSIVE_LOCK(_mutex);
// Ask the runtime to acquire a lock on the mutex
if (objc_mutex_trylock(_mutex) == -1)
return NO;
else
return YES;
{
return NO;
} else {
/*
* The recursive lock check goes here to support openstep's
* implementation. In openstep you can lock in one thread trylock in the
* same thread and have another thread release the lock.
*
* This is dangerous and broken IMHO.
*/
CHECK_RECURSIVE_LOCK(_mutex);
return YES;
}
}
- (BOOL) lockBeforeDate: (NSDate *)limit
{
[self notImplemented: _cmd];
return NO;
int x;
while ((x = objc_mutex_trylock (_mutex)) == -1 )
{
NSDate *current = [NSDate date];
NSComparisonResult compare;
compare = [current compare: limit];
if ( compare == NSOrderedSame || compare == NSOrderedDescending )
{
return NO;
}
/*
* This should probably be more accurate like usleep(250)
* but usleep is known to NOT be thread safe under all architectures.
*/
sleep(1);
}
/*
* The recursive lock check goes here to support openstep's implementation.
* In openstep you can lock in one thread trylock in the same thread and have
* another thread release the lock.
*
* This is dangerous and broken IMHO.
*/
CHECK_RECURSIVE_LOCK(_mutex);
return YES;
}
// NSLocking protocol
@ -236,7 +270,7 @@ NSString *NSRecursiveLockException = @"NSRecursiveLockException";
}
// If the depth is only 1 then we just acquired
// the lock above< bogus unlock so abort
// the lock above, bogus unlock so abort
if (depth == 1)
{
[NSException raise:NSConditionLockException
@ -297,9 +331,26 @@ NSString *NSRecursiveLockException = @"NSRecursiveLockException";
// Acquiring the lock with a date condition
- (BOOL) lockBeforeDate: (NSDate*)limit
{
[self notImplemented: _cmd];
return NO;
{
CHECK_RECURSIVE_CONDITION_LOCK(_mutex);
while ( objc_mutex_trylock (_mutex) == -1 )
{
NSDate *current = [NSDate date];
NSComparisonResult compare;
compare = [current compare: limit];
if ( compare == NSOrderedSame || compare == NSOrderedDescending )
{
return NO;
}
/*
* This should probably be more accurate like usleep(250)
* but usleep is known to NOT be thread safe under all architectures.
*/
sleep(1);
}
return YES;
}
@ -437,8 +488,23 @@ NSString *NSRecursiveLockException = @"NSRecursiveLockException";
- (BOOL) lockBeforeDate: (NSDate *)limit
{
[self notImplemented: _cmd];
return NO;
while ( objc_mutex_trylock (_mutex) == -1 )
{
NSDate *current = [NSDate date];
NSComparisonResult compare;
compare = [current compare: limit];
if ( compare == NSOrderedSame || compare == NSOrderedDescending )
{
return NO;
}
/*
* This should probably be more accurate like usleep(250)
* but usleep is known to NOT be thread safe under all architectures.
*/
sleep(1);
}
return YES;
}
// NSLocking protocol

30
Source/NSObject.m
View file

@ -175,32 +175,42 @@ NSDecrementExtraRefCountWasZero(id anObject)
* depending on whether we are using local or global counting.
*/
#if defined(REFCNT_LOCAL)
unsigned
NSExtraRefCount(id anObject)
{
return ((obj)anObject)[-1].retained;
}
static objc_mutex_t retain_counts_gate = NULL;
void
NSIncrementExtraRefCount(id anObject)
{
objc_mutex_lock (retain_counts_gate);
((obj)anObject)[-1].retained++;
objc_mutex_unlock (retain_counts_gate);
}
#define NSIncrementExtraRefCount(X) \
((obj)(X))[-1].retained++
#define NSIncrementExtraRefCount(X) \
objc_mutex_lock (retain_counts_gate); \
((obj)(X))[-1].retained++; \
objc_mutex_unlock (retain_counts_gate)
BOOL
NSDecrementExtraRefCountWasZero(id anObject)
{
objc_mutex_lock (retain_counts_gate);
if (((obj)anObject)[-1].retained-- == 0)
return YES;
else
return NO;
{
objc_mutex_unlock (retain_counts_gate);
return YES;
} else {
objc_mutex_unlock (retain_counts_gate);
return NO;
}
}
#define NSDecrementExtraRefCountWasZero(X) \
(((obj)(X))[-1].retained-- == 0 ? YES : NO)
#define NSExtraRefCount(X) (((obj)(X))[-1].retained)
@ -518,8 +528,12 @@ static BOOL double_release_check_enabled = NO;
#if !defined(REFCNT_LOCAL)
retain_counts = o_map_with_callbacks (o_callbacks_for_non_owned_void_p,
o_callbacks_for_int);
retain_counts_gate = objc_mutex_allocate ();
#endif
/*
* retain_counts_gate is needed on SMP machines for release to work
* reliably.
*/
retain_counts_gate = objc_mutex_allocate ();
fastMallocOffset = fastMallocClass->instance_size % ALIGN;
#else
fastMallocOffset = 0;

13
Source/NSTimeZone.m
View file

@ -972,12 +972,21 @@ static NSMapTable *absolutes = 0;
+ (NSString*) getTimeZoneFile: (NSString *)name
{
/*
* OpenStep does NOT put all the GMT+-* timezones in the Etc directory so all
* the OpenStep software will fail to work without this extra hack.
*/
NSString *fileName = [NSString stringWithFormat: @"%@%@",
ZONES_DIR, name];
return [NSBundle pathForGNUstepResource: fileName
NSString *path = [NSBundle pathForGNUstepResource: fileName
ofType: @""
inDirectory: TIME_ZONE_DIR];
if ( !path )
{
return [self getTimeZoneFile: [NSString stringWithFormat: @"Etc/%@", name]];
}
return path;
}
@end