Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup GC_CALLBACK blunder (190813 followup, r=shaver).

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@138241 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
brendan%mozilla.org 2003-02-22 22:56:57 +00:00
parent 5d35d944e0
commit c015bd7650
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mozilla/js/src/jsgc.c
View File

@ -1277,16 +1277,8 @@ restart:
}
}
#define GC_CALLBACK(status) \
if (rt->gcCallback) { \
if (status == JSGC_END && gcflags & GC_ALREADY_LOCKED) \
JS_UNLOCK_GC(rt); \
(void) rt->gcCallback(cx, status); \
if (status == JSGC_END && gcflags & GC_ALREADY_LOCKED) \
JS_LOCK_GC(rt); \
}
GC_CALLBACK(JSGC_MARK_END);
if (rt->gcCallback)
(void) rt->gcCallback(cx, JSGC_MARK_END);
/*
* Sweep phase.
@ -1378,7 +1370,8 @@ restart:
/* Terminate the new freelist. */
*flp = NULL;
GC_CALLBACK(JSGC_FINALIZE_END);
if (rt->gcCallback)
(void) rt->gcCallback(cx, JSGC_FINALIZE_END);
out:
JS_LOCK_GC(rt);
@ -1402,7 +1395,11 @@ out:
JS_UNLOCK_GC(rt);
#endif
GC_CALLBACK(JSGC_END);
#undef GC_CALLBACK
if (rt->gcCallback) {
if (gcflags & GC_ALREADY_LOCKED)
JS_UNLOCK_GC(rt);
(void) rt->gcCallback(cx, JSGC_END);
if (gcflags & GC_ALREADY_LOCKED)
JS_LOCK_GC(rt);
}
}