gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move buffer shrinking to atomic GC phase.

Browse Source
This commit is contained in:
Mike Pall 2013-04-21 01:00:01 +02:00
parent 9ead735159
commit 7b629b7bcf
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lj_gc.c
View File

@ -349,14 +349,6 @@ static size_t gc_propagate_gray(global_State *g)
/* -- Sweep phase --------------------------------------------------------- */ /* -- Sweep phase --------------------------------------------------------- */
/* Try to shrink some common data structures. */
static void gc_shrink(global_State *g, lua_State *L)
{
if (g->strnum <= (g->strmask >> 2) && g->strmask > LJ_MIN_STRTAB*2-1)
lj_str_resize(L, g->strmask >> 1); /* Shrink string table. */
lj_buf_shrink(L, &g->tmpbuf); /* Shrink temp buffer. */
}
/* Type of GC free functions. */ /* Type of GC free functions. */
typedef void (LJ_FASTCALL *GCFreeFunc)(global_State *g, GCobj *o); typedef void (LJ_FASTCALL *GCFreeFunc)(global_State *g, GCobj *o);
@ -591,6 +583,8 @@ static void atomic(global_State *g, lua_State *L)
/* All marking done, clear weak tables. */ /* All marking done, clear weak tables. */
gc_clearweak(gcref(g->gc.weak)); gc_clearweak(gcref(g->gc.weak));
lj_buf_shrink(L, &g->tmpbuf); /* Shrink temp buffer. */
/* Prepare for sweep phase. */ /* Prepare for sweep phase. */
g->gc.currentwhite = (uint8_t)otherwhite(g); /* Flip current white. */ g->gc.currentwhite = (uint8_t)otherwhite(g); /* Flip current white. */
g->strempty.marked = g->gc.currentwhite; g->strempty.marked = g->gc.currentwhite;
@ -631,7 +625,8 @@ static size_t gc_onestep(lua_State *L)
MSize old = g->gc.total; MSize old = g->gc.total;
setmref(g->gc.sweep, gc_sweep(g, mref(g->gc.sweep, GCRef), GCSWEEPMAX)); setmref(g->gc.sweep, gc_sweep(g, mref(g->gc.sweep, GCRef), GCSWEEPMAX));
if (gcref(*mref(g->gc.sweep, GCRef)) == NULL) { if (gcref(*mref(g->gc.sweep, GCRef)) == NULL) {
gc_shrink(g, L); if (g->strnum <= (g->strmask >> 2) && g->strmask > LJ_MIN_STRTAB*2-1)
lj_str_resize(L, g->strmask >> 1); /* Shrink string table. */
if (gcref(g->gc.mmudata)) { /* Need any finalizations? */ if (gcref(g->gc.mmudata)) { /* Need any finalizations? */
g->gc.state = GCSfinalize; g->gc.state = GCSfinalize;
} else { /* Otherwise skip this phase to help the JIT. */ } else { /* Otherwise skip this phase to help the JIT. */