detail (better presentation for 'luaC_step')

This commit is contained in:
Roberto Ierusalimschy 2014-02-11 10:28:47 -02:00
parent ba3586cc90
commit 6b30774469
1 changed files with 11 additions and 12 deletions

23
lgc.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lgc.c,v 2.168 2013/12/13 15:42:08 roberto Exp roberto $ ** $Id: lgc.c,v 2.169 2014/02/11 12:18:12 roberto Exp roberto $
** Garbage Collector ** Garbage Collector
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -1208,24 +1208,23 @@ void luaC_forcestep (lua_State *L) {
/* /*
** performs a basic GC step only if collector is running ** performs a basic GC step or a local collection when collector is running
*/ */
void luaC_step (lua_State *L) { void luaC_step (lua_State *L) {
global_State *g = G(L); global_State *g = G(L);
if (g->gcrunning) { if (!g->gcrunning)
if (g->gcstate != GCSpause) { luaE_setdebt(g, -GCSTEPSIZE); /* avoid being called too often */
luaC_forcestep(L); else {
} if (g->gcstate != GCSpause) /* in the middle of a cycle? */
luaC_forcestep(L); /* continue it */
else { else {
luaC_localcollection(L); luaC_localcollection(L); /* try a local collection */
if (gettotalbytes(g) > g->GCthreshold) { if (gettotalbytes(g) <= g->GCthreshold) /* enough? */
luaC_forcestep(L); /* restart collection */
}
else
luaE_setdebt(g, -g->gclocalpause); luaE_setdebt(g, -g->gclocalpause);
else /* local collection did not collect enough memory */
luaC_forcestep(L); /* start a full collection */
} }
} }
else luaE_setdebt(g, -GCSTEPSIZE); /* avoid being called too often */
} }