mirrors/lua
0
0
Fork 0
mirror of https://github.com/lua/lua.git synced 2024-11-23 18:23:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

change in the way 'collectgarbage("step", size)' interprets 'size'

Browse Source 
(mimicking the way the GC itself behaves when Lua allocates 'size'
Kbytes)
This commit is contained in:
Roberto Ierusalimschy 2014-02-14 14:43:14 -02:00
parent 0b04c561f5
commit 1cce3e6842
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lapi.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lapi.c,v 2.194 2014/02/13 12:11:34 roberto Exp roberto $ ** $Id: lapi.c,v 2.195 2014/02/13 17:25:20 roberto Exp roberto $
** Lua API ** Lua API
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -1070,12 +1070,20 @@ LUA_API int lua_gc (lua_State *L, int what, int data) {
break; break;
} }
case LUA_GCSTEP: { case LUA_GCSTEP: {
lu_mem debt = cast(lu_mem, data) * 1024 - GCSTEPSIZE; l_mem debt = 1; /* =1 to signal that it did an actual step */
if (g->gcrunning) int oldrunning = g->gcrunning;
debt += g->GCdebt; /* include current debt */ g->gcrunning = 1; /* force GC to run */
luaE_setdebt(g, debt); if (data == 0) {
luaC_forcestep(L); luaE_setdebt(g, -GCSTEPSIZE); /* to do a "small" step */
if (g->gcstate == GCSpause) /* end of cycle? */ luaC_step(L);
}
else { /* add 'data' to total debt */
debt = cast(l_mem, data) * 1024 + g->GCdebt;
luaE_setdebt(g, debt);
luaC_checkGC(L);
}
g->gcrunning = oldrunning; /* restore previous state */
if (debt > 0 && g->gcstate == GCSpause) /* end of cycle? */
res = 1; /* signal it */ res = 1; /* signal it */
break; break;
} }

22
lgc.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lgc.c,v 2.172 2014/02/13 14:46:38 roberto Exp roberto $ ** $Id: lgc.c,v 2.173 2014/02/13 17:25:20 roberto Exp roberto $
** Garbage Collector ** Garbage Collector
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -1087,11 +1087,15 @@ static l_mem getdebt (global_State *g) {
} }
/* /*
** performs a basic GC step ** performs a basic GC step when collector is running
*/ */
void luaC_forcestep (lua_State *L) { void luaC_step (lua_State *L) {
global_State *g = G(L); global_State *g = G(L);
l_mem debt = getdebt(g); l_mem debt = getdebt(g);
if (!g->gcrunning) { /* not running? */
luaE_setdebt(g, -GCSTEPSIZE * 10); /* avoid being called too often */
return;
}
do { do {
if (g->gcstate == GCScallfin && g->tobefnz) { if (g->gcstate == GCScallfin && g->tobefnz) {
unsigned int n = runafewfinalizers(L); unsigned int n = runafewfinalizers(L);
@ -1112,18 +1116,6 @@ void luaC_forcestep (lua_State *L) {
} }
/*
** performs a basic GC step when collector is running
*/
void luaC_step (lua_State *L) {
if (!G(L)->gcrunning)
luaE_setdebt(G(L), -GCSTEPSIZE); /* avoid being called too often */
else
luaC_forcestep(L);
}
/* /*
** performs a full GC cycle; if "isemergency", does not call ** performs a full GC cycle; if "isemergency", does not call
** finalizers (which could change stack positions) ** finalizers (which could change stack positions)

3
lgc.h
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lgc.h,v 2.78 2014/02/13 12:11:34 roberto Exp roberto $ ** $Id: lgc.h,v 2.79 2014/02/13 14:46:38 roberto Exp roberto $
** Garbage Collector ** Garbage Collector
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -126,7 +126,6 @@
LUAI_FUNC void luaC_fix (lua_State *L, GCObject *o); LUAI_FUNC void luaC_fix (lua_State *L, GCObject *o);
LUAI_FUNC void luaC_freeallobjects (lua_State *L); LUAI_FUNC void luaC_freeallobjects (lua_State *L);
LUAI_FUNC void luaC_step (lua_State *L); LUAI_FUNC void luaC_step (lua_State *L);
LUAI_FUNC void luaC_forcestep (lua_State *L);
LUAI_FUNC void luaC_runtilstate (lua_State *L, int statesmask); LUAI_FUNC void luaC_runtilstate (lua_State *L, int statesmask);
LUAI_FUNC void luaC_fullgc (lua_State *L, int isemergency); LUAI_FUNC void luaC_fullgc (lua_State *L, int isemergency);
LUAI_FUNC GCObject *luaC_newobj (lua_State *L, int tt, size_t sz); LUAI_FUNC GCObject *luaC_newobj (lua_State *L, int tt, size_t sz);