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

improve caching of bundle content paths

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34477 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2012-01-10 09:38:23 +00:00
parent 27418ac04f
commit 209e988009
2 changed files with 87 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2012-01-10 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSBundle.m: Remove cached paths when the owning bundle is
deallocated. Use cache to determine which resource directories to
search.
2012-01-09 Richard Frith-Macdonald <rfm@gnu.org> 2012-01-09 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSBundle.m: Crude/simple caching of directory contents to * Source/NSBundle.m: Crude/simple caching of directory contents to

96
Source/NSBundle.m
View file

@ -389,15 +389,40 @@ bundle_object_name(NSString *path, NSString* executable)
} }
/* Construct a path from components */ /* Construct a path from components */
static NSString * static void
_bundle_resource_path(NSString *primary, NSString* bundlePath, NSString *lang) addBundlePath(NSMutableArray *list, NSArray *contents,
NSString *path, NSString *subdir, NSString *lang)
{ {
if (bundlePath) if (nil == contents)
primary = [primary stringByAppendingPathComponent: bundlePath]; {
if (lang) return;
primary = [primary stringByAppendingPathComponent: }
[NSString stringWithFormat: @"%@.lproj", lang]]; if (nil != subdir)
return primary; {
if (NO == [contents containsObject: subdir])
{
return;
}
path = [path stringByAppendingPathComponent: subdir];
if (nil == (contents = bundle_directory_readable(path)))
{
return;
}
}
if (nil != lang)
{
lang = [lang stringByAppendingPathExtension: @"lproj"];
if (NO == [contents containsObject: lang])
{
return;
}
path = [path stringByAppendingPathComponent: lang];
if (nil == (contents = bundle_directory_readable(path)))
{
return;
}
}
[list addObject: path];
} }
/* Try to locate name framework in standard places /* Try to locate name framework in standard places
@ -1513,7 +1538,10 @@ IF_NO_GC(
} }
if (_path != nil) if (_path != nil)
{ {
NSString *identifier = [self bundleIdentifier]; NSString *identifier = [self bundleIdentifier];
NSUInteger plen = [_path length];
NSEnumerator *enumerator;
NSString *path;
[load_lock lock]; [load_lock lock];
NSMapRemove(_bundles, _path); NSMapRemove(_bundles, _path);
@ -1522,6 +1550,41 @@ IF_NO_GC(
NSMapRemove(_byIdentifier, identifier); NSMapRemove(_byIdentifier, identifier);
} }
[load_lock unlock]; [load_lock unlock];
/* Clean up path cache for this bundle.
*/
[pathCacheLock lock];
enumerator = [pathCache keyEnumerator];
while (nil != (path = [enumerator nextObject]))
{
if (YES == [path hasPrefix: _path])
{
if ([path length] == plen)
{
/* Remove the bundle directory path from the cache.
*/
[pathCache removeObjectForKey: path];
}
else
{
unichar c = [path characterAtIndex: plen];
/* if the directory is inside the bundle, remove from cache.
*/
if ('/' == c)
{
[pathCache removeObjectForKey: path];
}
#if defined(__MINGW__)
else if ('\\' == c)
{
[pathCache removeObjectForKey: path];
}
#endif
}
}
}
[pathCacheLock unlock];
RELEASE(_path); RELEASE(_path);
} }
TEST_RELEASE(_frameworkVersion); TEST_RELEASE(_frameworkVersion);
@ -1751,6 +1814,7 @@ IF_NO_GC(
NSString *primary; NSString *primary;
NSString *language; NSString *language;
NSArray *languages; NSArray *languages;
NSArray *contents;
NSMutableArray *array; NSMutableArray *array;
NSEnumerator *enumerate; NSEnumerator *enumerate;
@ -1759,12 +1823,13 @@ IF_NO_GC(
stringArrayForKey: @"NSLanguages"]; stringArrayForKey: @"NSLanguages"];
primary = [rootPath stringByAppendingPathComponent: @"Resources"]; primary = [rootPath stringByAppendingPathComponent: @"Resources"];
[array addObject: _bundle_resource_path(primary, subPath, nil)]; contents = bundle_directory_readable(primary);
addBundlePath(array, contents, primary, subPath, nil);
/* If we have been asked for a specific localization, we add it. /* If we have been asked for a specific localization, we add it.
*/ */
if (localization != nil) if (localization != nil)
{ {
[array addObject: _bundle_resource_path(primary, subPath, localization)]; addBundlePath(array, contents, primary, subPath, localization);
} }
else else
{ {
@ -1775,21 +1840,22 @@ IF_NO_GC(
enumerate = [languages objectEnumerator]; enumerate = [languages objectEnumerator];
while ((language = [enumerate nextObject])) while ((language = [enumerate nextObject]))
{ {
[array addObject: _bundle_resource_path(primary, subPath, language)]; addBundlePath(array, contents, primary, subPath, language);
} }
} }
primary = rootPath; primary = rootPath;
[array addObject: _bundle_resource_path(primary, subPath, nil)]; contents = bundle_directory_readable(primary);
addBundlePath(array, contents, primary, subPath, nil);
if (localization != nil) if (localization != nil)
{ {
[array addObject: _bundle_resource_path(primary, subPath, localization)]; addBundlePath(array, contents, primary, subPath, localization);
} }
else else
{ {
enumerate = [languages objectEnumerator]; enumerate = [languages objectEnumerator];
while ((language = [enumerate nextObject])) while ((language = [enumerate nextObject]))
{ {
[array addObject: _bundle_resource_path(primary, subPath, language)]; addBundlePath(array, contents, primary, subPath, language);
} }
} }
return array; return array;