<rdar://problem/3885708> save memory in icon DB by not using NSSets when holding...

        Reviewed by sullivan.

        * Misc.subproj/WebIconDatabase.m:
        (+[WebIconDatabase sharedIconDatabase]): added timing code
        (-[WebIconDatabase _clearDictionaries]): new
        (-[WebIconDatabase _loadIconDictionaries]): call _clearDictionaries in 2 places before we bail, use _web_setObjectUsingSetIfNecessary:forKey: when adding site URLs to the iconURLToURLs dictionary
        (-[WebIconDatabase _updateFileDatabase]): fixed comment
        (-[WebIconDatabase _setIconURL:forURL:]): use _web_setObjectUsingSetIfNecessary:forKey: when adding site URLs to the iconURLToURLs dictionary
        (-[WebIconDatabase _releaseIconForIconURLString:]): handle NSString objects retured from iconURLToURLs
        (-[NSMutableDictionary _web_setObjectUsingSetIfNecessary:forKey:]): new, puts a set on the dictionary when there are 2 or more object for s key

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8034 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 30839ff618dd1ad5426d4aaf3b12f054b2e31f4e..d0a832a5860fb81d21079fecdb3a49ba929aff4e 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2004-11-18  Chris Blumenberg  <cblu@apple.com>
+
+       <rdar://problem/3885708> save memory in icon DB by not using NSSets when holding 1 object
+       
+        Reviewed by sullivan.
+
+        * Misc.subproj/WebIconDatabase.m:
+        (+[WebIconDatabase sharedIconDatabase]): added timing code
+        (-[WebIconDatabase _clearDictionaries]): new
+        (-[WebIconDatabase _loadIconDictionaries]): call _clearDictionaries in 2 places before we bail, use _web_setObjectUsingSetIfNecessary:forKey: when adding site URLs to the iconURLToURLs dictionary
+        (-[WebIconDatabase _updateFileDatabase]): fixed comment
+        (-[WebIconDatabase _setIconURL:forURL:]): use _web_setObjectUsingSetIfNecessary:forKey: when adding site URLs to the iconURLToURLs dictionary
+        (-[WebIconDatabase _releaseIconForIconURLString:]): handle NSString objects retured from iconURLToURLs
+        (-[NSMutableDictionary _web_setObjectUsingSetIfNecessary:forKey:]): new, puts a set on the dictionary when there are 2 or more object for s key
+
 2004-11-17  Richard Williamson   <rjw@apple.com>
 
        Fixed <rdar://problem/3885073> REGRESSION: Tab images at top of news.com.com replicated and squished

diff --git a/WebKit/Misc.subproj/WebIconDatabase.m b/WebKit/Misc.subproj/WebIconDatabase.m
index 50c5deef14543e568c6746b96077093e3be6522a..e0202395ac95a193a4f6197911f31d997b588aea 100644 (file)
--- a/WebKit/Misc.subproj/WebIconDatabase.m
+++ b/WebKit/Misc.subproj/WebIconDatabase.m
@@ -32,8 +32,8 @@ NSSize WebIconSmallSize = {16, 16};
 NSSize WebIconMediumSize = {32, 32};
 NSSize WebIconLargeSize = {128, 128};
 
-@interface NSEnumerator (WebIconDatabase)
-- (BOOL)_web_isAllStrings;
+@interface NSMutableDictionary (WebIconDatabase)
+- (void)_web_setObjectUsingSetIfNecessary:(id)object forKey:(id)key;
 @end
 
 @interface WebIconDatabase (WebInternal)
@@ -64,7 +64,14 @@ NSSize WebIconLargeSize = {128, 128};
     static WebIconDatabase *database = nil;
     
     if (!database) {
+#if !LOG_DISABLED
+        double start = CFAbsoluteTimeGetCurrent();
+#endif
         database = [[WebIconDatabase alloc] init];
+#if !LOG_DISABLED
+        Log(Timing, "initializing icon database with %d sites and %d icons took %f", 
+              [database->_private->URLToIconURL count], [database->_private->iconURLToURLs count], (CFAbsoluteTimeGetCurrent() - start));
+#endif
     }
     return database;
 }
@@ -238,6 +245,18 @@ NSSize WebIconLargeSize = {128, 128};
     [_private->fileDatabase open];
 }
 
+- (void)_clearDictionaries
+{
+    [_private->URLToIconURL release];
+    [_private->iconURLToURLs release];
+    [_private->iconsOnDiskWithURLs release];
+    [_private->originalIconsOnDiskWithURLs release];
+    _private->URLToIconURL = [[NSMutableDictionary alloc] init];
+    _private->iconURLToURLs = [[NSMutableDictionary alloc] init];
+    _private->iconsOnDiskWithURLs = [[NSMutableSet alloc] init];
+    _private->originalIconsOnDiskWithURLs = [[NSMutableSet alloc] init];
+}
+
 - (void)_loadIconDictionaries
 {
     WebFileDatabase *fileDB = _private->fileDatabase;
@@ -258,7 +277,6 @@ NSSize WebIconLargeSize = {128, 128};
     NSMutableDictionary *URLToIconURL = nil;
     if (v <= WebIconDatabaseCurrentVersion) {
         URLToIconURL = [[fileDB objectForKey:WebURLToIconURLKey] retain];
-        
         // Remove the old unnecessary mapping files.
         if (v < WebIconDatabaseCurrentVersion) {
             [fileDB removeObjectForKey:ObsoleteIconsOnDiskKey];
@@ -267,8 +285,8 @@ NSSize WebIconLargeSize = {128, 128};
     }
     
     if (![URLToIconURL isKindOfClass:[NSMutableDictionary class]]) {
-        [URLToIconURL release];
-        URLToIconURL = [[NSMutableDictionary alloc] init];
+        [self _clearDictionaries];
+        return;
     }
 
     // Keep a set of icon URLs on disk so we know what we need to write out or remove.
@@ -281,21 +299,10 @@ NSSize WebIconLargeSize = {128, 128};
     while ((URL = [enumerator nextObject])) {
         NSString *iconURL = (NSString *)[URLToIconURL objectForKey:URL];
         if (![URL isKindOfClass:[NSString class]] || ![iconURL isKindOfClass:[NSString class]]) {
-            [URLToIconURL release];
-            [iconURLToURLs release];
-            [iconsOnDiskWithURLs release];
-            URLToIconURL = [[NSMutableDictionary alloc] init];
-            iconURLToURLs = [[NSMutableDictionary alloc] init];
-            iconsOnDiskWithURLs = [[NSMutableSet alloc] init];
-            break;
-        }
-        NSMutableSet *iconURLs = (NSMutableSet *)[iconURLToURLs objectForKey:iconURL];
-        if (iconURLs == nil) {
-            iconURLs = [[NSMutableSet alloc] init];
-            [iconURLToURLs setObject:iconURLs forKey:iconURL];
-            [iconURLs release];
+            [self _clearDictionaries];
+            return;
         }
-        [iconURLs addObject:URL];
+        [iconURLToURLs _web_setObjectUsingSetIfNecessary:URL forKey:iconURL];
     }
 
     _private->URLToIconURL = URLToIconURL;
@@ -334,9 +341,9 @@ NSSize WebIconLargeSize = {128, 128};
     while ((iconURLString = [enumerator nextObject]) != nil) {
         NSMutableDictionary *icons = [_private->iconURLToIcons objectForKey:iconURLString];
         if (icons) {
-            // Save the 16 x 16 size icons as this is the only size the Safari uses.
+            // Save the 16 x 16 size icons as this is the only size that Safari uses.
             // If we ever use larger sizes, we should save the largest size so icons look better when scaling up.
-            // This also worksaround the problem with cnet's blank 32x32 icon (3105486).
+            // This also works around the problem with cnet's blank 32x32 icon (3105486).
             NSImage *icon = [icons objectForKey:[NSValue valueWithSize:NSMakeSize(16,16)]];
             if (!icon) {
                 // In case there is no 16 x 16 size.
@@ -500,13 +507,7 @@ NSSize WebIconLargeSize = {128, 128};
     }
     
     [_private->URLToIconURL setObject:iconURL forKey:URL];
-    
-    NSMutableSet *URLStrings = [_private->iconURLToURLs objectForKey:iconURL];
-    if (!URLStrings) {
-        URLStrings = [NSMutableSet set];
-        [_private->iconURLToURLs setObject:URLStrings forKey:iconURL];
-    }
-    [URLStrings addObject:URL];
+    [_private->iconURLToURLs _web_setObjectUsingSetIfNecessary:URL forKey:iconURL];
 
     int futureRetainCount = (int)(void *)CFDictionaryGetValue(_private->futureURLToRetainCount, URL);
 
@@ -567,8 +568,13 @@ NSSize WebIconLargeSize = {128, 128};
 
         // Remove the icon's associated site URLs
         [iconURLString retain];
-        NSSet *URLStrings = [_private->iconURLToURLs objectForKey:iconURLString];
-        [_private->URLToIconURL removeObjectsForKeys:[URLStrings allObjects]];
+        id URLs = [_private->iconURLToURLs objectForKey:iconURLString];
+        if ([URLs isKindOfClass:[NSMutableSet class]]) {
+            [_private->URLToIconURL removeObjectsForKeys:[URLs allObjects]];
+        } else {
+            ASSERT([URLs isKindOfClass:[NSString class]]);
+            [_private->URLToIconURL removeObjectForKey:URLs];
+        }
         [_private->iconURLToURLs removeObjectForKey:iconURLString];
         [iconURLString release];
     }
@@ -729,18 +735,20 @@ NSSize WebIconLargeSize = {128, 128};
 
 @end
 
-@implementation NSEnumerator (WebIconDatabase)
+@implementation NSMutableDictionary (WebIconDatabase)
 
-- (BOOL)_web_isAllStrings
+- (void)_web_setObjectUsingSetIfNecessary:(id)object forKey:(id)key
 {
-    Class c = [NSString class];
-    id o;
-    while ((o = [self nextObject])) {
-        if (![o isKindOfClass:c]) {
-            return NO;
-        }
+    id previousObject = [self objectForKey:key];
+    if (previousObject == nil) {
+        [self setObject:object forKey:key];
+    } else if ([previousObject isKindOfClass:[NSMutableSet class]]) {
+        [previousObject addObject:object];
+    } else {
+        NSMutableSet *objects = [[NSMutableSet alloc] initWithObjects:previousObject, object, nil];
+        [self setObject:objects forKey:key];
+        [objects release];
     }
-    return YES;
 }
 
 @end