gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

yet another tweak for attributes caching

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@37333 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2013-10-30 12:51:52 +00:00
parent 990f4bcfaa
commit 23b895ab49
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Source/GSAttributedString.m
View file

@ -143,11 +143,12 @@ cacheAttributes(NSDictionary *attrs)
node = GSIMapNodeForKey(&attrMap, (GSIMapKey)((id)attrs));
if (node == 0)
{
/* Shallow copy of dictionary, without copying objects ....
* result in an immutable dictionary that can safely be cached.
/* Deep copy of dictionary, including copying objects ....
* result in an immutable dictionary that can safely be cached
* unless the copied objects or their contents are mutated.
*/
attrs = [(NSDictionary*)[GSCachedDictionary alloc]
initWithDictionary: attrs copyItems: NO];
initWithDictionary: attrs copyItems: YES];
GSIMapAddPair(&attrMap,
(GSIMapKey)((id)attrs), (GSIMapVal)(NSUInteger)1);
}
@ -169,8 +170,9 @@ unCacheAttributes(NSDictionary *attrs)
{
if (nil != attrs)
{
GSIMapBucket bucket;
id<GSCachedDictionary> removed = nil;
GSIMapBucket bucket;
BOOL found = NO;
id<GSCachedDictionary> removed = nil;
ALOCK();
bucket = GSIMapBucketForKey(&attrMap, (GSIMapKey)((id)attrs));
@ -182,6 +184,7 @@ unCacheAttributes(NSDictionary *attrs)
bucket, (GSIMapKey)((id)attrs));
if (node != 0)
{
found = YES;
if (--node->value.nsu == 0)
{
removed = node->key.obj;
@ -195,6 +198,11 @@ unCacheAttributes(NSDictionary *attrs)
{
[removed _uncache];
}
if (NO == found)
{
[NSException raise: NSInternalInconsistencyException
format: @"NSAttributedString attempt to remove attributes which are not found in the cache. Did someone mutate an object in the attributes dictionary? The object to remove was %@", attrs];
}
}
}