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

Improve absolute time zone caching

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@38465 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2015-04-28 16:47:54 +00:00
parent 5f08b9784e
commit 681ab5aa23
2 changed files with 68 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2015-04-20 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSTimeZone.m: Improve caching of common absolute timezones.
2015-04-28 Niels Grewe <niels.grewe@halbordnung.de>
* Source/NSDateFormatter.m: Properly reinstall the user provided

66
Source/NSTimeZone.m
View file

@ -222,6 +222,7 @@ static NSString *tzdir = nil;
*/
static GSPlaceholderTimeZone *defaultPlaceholderTimeZone;
static NSMapTable *placeholderMap;
static GSAbsTimeZone *commonAbsolutes[145] = { 0 };
/*
* Temporary structure for holding time zone details.
@ -703,6 +704,17 @@ static NSMapTable *absolutes = 0;
}
anOffset *= sign;
if (anOffset % 900 == 0)
{
z = commonAbsolutes[anOffset/900 + 72];
if (z != nil)
{
IF_NO_GC(RETAIN(z));
DESTROY(self);
return z;
}
}
if (zone_mutex != nil)
{
[zone_mutex lock];
@ -748,6 +760,15 @@ static NSMapTable *absolutes = 0;
NSMapInsert(absolutes, (void*)(uintptr_t)anOffset, (void*)z);
[zoneDictionary setObject: self forKey: (NSString*)name];
}
if (anOffset % 900 == 0)
{
int index = anOffset/900 + 72;
if (nil == commonAbsolutes[index])
{
commonAbsolutes[index] = RETAIN(self);
}
}
if (zone_mutex != nil)
{
[zone_mutex unlock];
@ -1927,9 +1948,50 @@ localZoneString, [zone name], sign, s/3600, (s/60)%60);
+ (NSTimeZone*) timeZoneForSecondsFromGMT: (NSInteger)seconds
{
NSTimeZone *zone;
int sign = seconds >= 0 ? 1 : -1;
int extra;
zone = [[GSAbsTimeZone alloc] initWithOffset: seconds name: nil];
return AUTORELEASE(zone);
/*
* Round the offset to the nearest minute, (for MacOS-X compatibility)
* and ensure it is no more than 18 hours.
*/
seconds *= sign;
extra = seconds % 60;
if (extra < 30)
{
seconds -= extra;
}
else
{
seconds += 60 - extra;
}
if (seconds > 64800)
{
return nil;
}
seconds *= sign;
if (seconds % 900 == 0)
{
zone = commonAbsolutes[seconds/900 + 72];
}
else
{
if (zone_mutex != nil)
{
[zone_mutex lock];
}
zone = (NSTimeZone*)NSMapGet(absolutes, (void*)(uintptr_t)seconds);
if (zone_mutex != nil)
{
[zone_mutex unlock];
}
}
if (nil == zone)
{
zone = [[GSAbsTimeZone alloc] initWithOffset: seconds name: nil];
zone = AUTORELEASE(zone);
}
return zone;
}
/**