wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 553671 part 6 - Rewrite GCUntilDone() to get rid of the goto. r=gal.

Browse Source 
--HG--
extra : rebase_source : f571c42ad8661e1a0f5be6042eafea33f507dc44
This commit is contained in:
Jason Orendorff 2010-04-08 08:03:08 -05:00
parent d1526f1df5
commit 741bacca43
1 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
js/src/jsgc.cpp
View File

@ -3124,36 +3124,27 @@ GC(JSContext *cx, JSGCInvocationKind gckind GCTIMER_PARAM)
static void static void
GCUntilDone(JSContext *cx, JSGCInvocationKind gckind GCTIMER_PARAM) GCUntilDone(JSContext *cx, JSGCInvocationKind gckind GCTIMER_PARAM)
{ {
JS_ASSERT_NOT_ON_TRACE(cx);
JSRuntime *rt = cx->runtime; JSRuntime *rt = cx->runtime;
JS_UNLOCK_GC(rt); bool firstRun = true;
#ifdef JS_TRACER do {
if (!JS_ON_TRACE(cx))
#endif
{
VOUCH_HAVE_STACK();
PreGCCleanup(cx, gckind);
TIMESTAMP(gcTimer.startMark);
restart:
GC(cx, gckind GCTIMER_ARG);
}
JS_LOCK_GC(rt);
/*
* We want to restart GC if js_GC was called recursively or if any of the
* finalizers called js_RemoveRoot or js_UnlockGCThingRT.
*/
if (!JS_ON_TRACE(cx) && (rt->gcLevel > 1 || rt->gcPoke)) {
VOUCH_HAVE_STACK();
rt->gcLevel = 1; rt->gcLevel = 1;
rt->gcPoke = JS_FALSE; rt->gcPoke = JS_FALSE;
JS_UNLOCK_GC(rt);
goto restart; AutoUnlockGC unlock(rt);
} if (firstRun) {
PreGCCleanup(cx, gckind);
TIMESTAMP(gcTimer.startMark);
firstRun = false;
}
GC(cx, gckind GCTIMER_ARG);
// GC again if:
// - another thread, not in a request, called js_GC
// - js_GC was called recursively
// - a finalizer called js_RemoveRoot or js_UnlockGCThingRT.
} while (rt->gcLevel > 1 || rt->gcPoke);
} }
/* /*
@ -3439,7 +3430,8 @@ js_GC(JSContext *cx, JSGCInvocationKind gckind)
goto restart_at_beginning; goto restart_at_beginning;
} }
GCUntilDone(cx, gckind GCTIMER_ARG); if (!JS_ON_TRACE(cx))
GCUntilDone(cx, gckind GCTIMER_ARG);
rt->setGCLastBytes(rt->gcBytes); rt->setGCLastBytes(rt->gcBytes);
done_running: done_running: