Bug 938429 - Bump the trusted script buffer for macosx64 a bit. r=luke

This commit is contained in:
Bobby Holley 2013-11-17 18:46:40 -08:00
parent ed185f8be3
commit f1e34517cf

View File

@ -2951,6 +2951,7 @@ XPCJSRuntime::XPCJSRuntime(nsXPConnect* aXPConnect)
// ordered by the effective categories in which they are grouped in the // ordered by the effective categories in which they are grouped in the
// JS_SetNativeStackQuota call (which predates this analysis). // JS_SetNativeStackQuota call (which predates this analysis).
// //
// (NB: These numbers may have drifted recently - see bug 938429)
// OSX 64-bit Debug: 7MB stack, 636 stack frames => ~11.3k per stack frame // OSX 64-bit Debug: 7MB stack, 636 stack frames => ~11.3k per stack frame
// OSX64 Opt: 7MB stack, 2440 stack frames => ~3k per stack frame // OSX64 Opt: 7MB stack, 2440 stack frames => ~3k per stack frame
// //
@ -2978,9 +2979,9 @@ XPCJSRuntime::XPCJSRuntime(nsXPConnect* aXPConnect)
#if defined(XP_MACOSX) || defined(DARWIN) #if defined(XP_MACOSX) || defined(DARWIN)
// MacOS has a gargantuan default stack size of 8MB. Go wild with 7MB, // MacOS has a gargantuan default stack size of 8MB. Go wild with 7MB,
// and give trusted script 120k extra. The stack is huge on mac anyway. // and give trusted script 140k extra. The stack is huge on mac anyway.
const size_t kStackQuota = 7 * 1024 * 1024; const size_t kStackQuota = 7 * 1024 * 1024;
const size_t kTrustedScriptBuffer = 120 * 1024; const size_t kTrustedScriptBuffer = 140 * 1024;
#elif defined(MOZ_ASAN) #elif defined(MOZ_ASAN)
// ASan requires more stack space due to red-zones, so give it double the // ASan requires more stack space due to red-zones, so give it double the
// default (2MB on 32-bit, 4MB on 64-bit). ASAN stack frame measurements // default (2MB on 32-bit, 4MB on 64-bit). ASAN stack frame measurements