Changeset 10476

Timestamp:

2005-09-06 14:40:13 (3 years ago)

Author:

hyatt

Message:

Reduce the # of cached pages for a back/forward list. The old cache would cache the
following per tab:
> 1gb memory = 16 pages per tab/window
> 512mb memory = 8 pages per tab/window
<= 512mb memory = 4 pages per tab/window

This consumes far too much memory and is way too aggressive. The new cache sizes are
as follows:
>= 1gb memory = 3 pages per tab/window
>= 512mb memory = 2 pages per tab/window
< 512mb memory = 1 page per tab/window

Reviewed by john

• History.subproj/WebBackForwardList.m: (-pageCacheSize):
• WebView.subproj/WebPreferences.m: (+initialize):

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• History.subproj/WebBackForwardList.m (modified) (2 diffs)
• WebView.subproj/WebPreferences.m (modified) (1 diff)

trunk/WebKit/ChangeLog

@@ +1 @@
+2005-09-06  David Hyatt  <hyatt@apple.com>
+
+        Reduce the # of cached pages for a back/forward list.  The old cache would cache the
+        following per tab:
+        > 1gb memory = 16 pages per tab/window
+        > 512mb memory = 8 pages per tab/window
+        <= 512mb memory = 4 pages per tab/window
+
+        This consumes far too much memory and is way too aggressive.  The new cache sizes are
+        as follows:
+        >= 1gb memory = 3 pages per tab/window
+        >= 512mb memory = 2 pages per tab/window
+        < 512mb memory = 1 page per tab/window
+
+        Reviewed by john
+
+        * History.subproj/WebBackForwardList.m:
+        (-[WebBackForwardList pageCacheSize]):
+        * WebView.subproj/WebPreferences.m:
+        (+[WebPreferences initialize]):
+
 2005-09-05  Darin Adler  <darin@apple.com>
 

trunk/WebKit/History.subproj/WebBackForwardList.m

@@ -311 +311 @@
         unsigned s;
         vm_size_t memSize = WebSystemMainMemory();
-        unsigned multiplier = 1;
         
         s = [[WebPreferences standardPreferences] _pageCacheSize];
-        if (memSize > 1024 * 1024 * 1024)
-            multiplier = 4;
-        else if (memSize > 512 * 1024 * 1024)
-            multiplier = 2;
+        if (memSize >= 1024 * 1024 * 1024)
+            _private->pageCacheSize = s;
+        else if (memSize >= 512 * 1024 * 1024)
+            _private->pageCacheSize = s - 1;
+        else
+            _private->pageCacheSize = s - 2;
 
 #ifndef NDEBUG
@@ -325 +326 @@
         }
 #endif
-
-        _private->pageCacheSize = s * multiplier;
     }
     

trunk/WebKit/WebView.subproj/WebPreferences.m

@@ -213 +213 @@
         @"13",                          WebKitDefaultFixedFontSizePreferenceKey,
         @"ISO-8859-1",                  WebKitDefaultTextEncodingNamePreferenceKey,
-        @"4",                           WebKitPageCacheSizePreferenceKey,
+        @"3",                           WebKitPageCacheSizePreferenceKey,
         @"8388608",                     WebKitObjectCacheSizePreferenceKey,
         [NSNumber numberWithBool:NO],   WebKitUserStyleSheetEnabledPreferenceKey,