Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 52c66b17843e (bug 592907).

Browse Source
This commit is contained in:
Andreas Gal 2010-09-23 16:21:37 -07:00
parent d1df5e15ea
commit ae80e2268b
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/base/nsJSEnvironment.cpp
View File

@ -3882,12 +3882,12 @@ SetMemoryHighWaterMarkPrefChangedCallback(const char* aPrefName, void* aClosure)
* to use jsmalloc() and the other is to use GC-owned memory
* (e.g. js_NewGCThing()).
*
* In the browser, we limit the amount of GC-owned memory to 512MB.
* In the browser, we don't cap the amount of GC-owned memory.
*/
JS_SetGCParameter(nsJSRuntime::sRuntime, JSGC_MAX_MALLOC_BYTES,
64L * 1024L * 1024L);
JS_SetGCParameter(nsJSRuntime::sRuntime, JSGC_MAX_BYTES,
512L * 1024L * 1024L);
0xffffffff);
} else {
JS_SetGCParameter(nsJSRuntime::sRuntime, JSGC_MAX_MALLOC_BYTES,
highwatermark * 1024L * 1024L);

2
js/src/jsgc.cpp
View File

@ -2813,7 +2813,6 @@ MarkAndSweep(JSContext *cx GCTIMER_PARAM)
/*
* Mark phase.
*/
TIMESTAMP(startMark);
GCMarker gcmarker(cx);
JS_ASSERT(IS_GC_MARKING_TRACER(&gcmarker));
JS_ASSERT(gcmarker.getMarkColor() == BLACK);
@ -3175,6 +3174,7 @@ GCUntilDone(JSContext *cx, JSGCInvocationKind gckind GCTIMER_PARAM)
AutoUnlockGC unlock(rt);
if (firstRun) {
PreGCCleanup(cx, gckind);
TIMESTAMP(startMark);
firstRun = false;
}
MarkAndSweep(cx GCTIMER_ARG);

3
js/src/shell/js.cpp
View File

@ -5333,7 +5333,7 @@ main(int argc, char **argv, char **envp)
CALIBRATION_DELAY_COUNT = 0;
#endif
rt = JS_NewRuntime(64L * 1024L * 1024L);
rt = JS_NewRuntime(128L * 1024L * 1024L);
if (!rt)
return 1;
@ -5345,7 +5345,6 @@ main(int argc, char **argv, char **envp)
return 1;
JS_SetGCParameterForThread(cx, JSGC_MAX_CODE_CACHE_BYTES, 16 * 1024 * 1024);
JS_SetGCParameter(rt, JSGC_MAX_BYTES, 512L * 1024L * 1024L);
result = shell(cx, argc, argv, envp);