From 42890c79a8e4b05d40177b504bdce683baae1a09 Mon Sep 17 00:00:00 2001 From: Luke Wagner Date: Wed, 30 Jun 2010 20:02:00 -0700 Subject: [PATCH] Double browser max heap size. Change shell heap size so it matches. --- dom/base/nsJSEnvironment.cpp | 2 +- js/src/shell/js.cpp | 2 +- js/src/xpconnect/src/nsXPConnect.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp index 9b8fe92f9af..93c6aa5f05f 100644 --- a/dom/base/nsJSEnvironment.cpp +++ b/dom/base/nsJSEnvironment.cpp @@ -3934,7 +3934,7 @@ SetMemoryHighWaterMarkPrefChangedCallback(const char* aPrefName, void* aClosure) // Let's limit the high water mark for the first one to 32MB, // and second one to 0xffffffff. JS_SetGCParameter(nsJSRuntime::sRuntime, JSGC_MAX_MALLOC_BYTES, - 32L * 1024L * 1024L); + 64L * 1024L * 1024L); JS_SetGCParameter(nsJSRuntime::sRuntime, JSGC_MAX_BYTES, 0xffffffff); } else { diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp index 77564ea8447..88ca0aa85fe 100644 --- a/js/src/shell/js.cpp +++ b/js/src/shell/js.cpp @@ -5102,7 +5102,7 @@ main(int argc, char **argv, char **envp) CALIBRATION_DELAY_COUNT = 0; #endif - rt = JS_NewRuntime(128L * 1024L * 1024L); + rt = JS_NewRuntime(64L * 1024L * 1024L); if (!rt) return 1; diff --git a/js/src/xpconnect/src/nsXPConnect.cpp b/js/src/xpconnect/src/nsXPConnect.cpp index 191cb0f2c79..78c12bb2ffe 100644 --- a/js/src/xpconnect/src/nsXPConnect.cpp +++ b/js/src/xpconnect/src/nsXPConnect.cpp @@ -2804,7 +2804,7 @@ JS_EXPORT_API(void) DumpJSObject(JSObject* obj) JS_EXPORT_API(void) DumpJSValue(jsval val) { - printf("Dumping 0x%ll.\n", (long long) JSVAL_BITS(val)); + printf("Dumping 0x%llu.\n", (long long) JSVAL_BITS(val)); if(JSVAL_IS_NULL(val)) { printf("Value is null\n"); }