rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

details

This commit is contained in:
Roberto Ierusalimschy 2013-12-13 13:42:08 -02:00
parent c8585efc78
commit 88e23f508c
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lgc.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lgc.c,v 2.166 2013/09/17 15:40:06 roberto Exp roberto $ ** $Id: lgc.c,v 2.167 2013/12/13 15:17:00 roberto Exp roberto $
** Garbage Collector ** Garbage Collector
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -226,54 +226,50 @@ GCObject *luaC_newobj (lua_State *L, int tt, size_t sz) {
** upvalues are already linked in 'headuv' list.) ** upvalues are already linked in 'headuv' list.)
*/ */
static void reallymarkobject (global_State *g, GCObject *o) { static void reallymarkobject (global_State *g, GCObject *o) {
lu_mem size;
reentry: reentry:
white2gray(o); white2gray(o);
switch (gch(o)->tt) { switch (gch(o)->tt) {
case LUA_TSHRSTR: case LUA_TSHRSTR:
case LUA_TLNGSTR: { case LUA_TLNGSTR: {
size = sizestring(gco2ts(o)); gray2black(o);
break; /* nothing else to mark; make it black */ g->GCmemtrav += sizestring(gco2ts(o));
break;
} }
case LUA_TUSERDATA: { case LUA_TUSERDATA: {
Table *mt = gco2u(o)->metatable; markobject(g, gco2u(o)->metatable); /* mark its metatable */
markobject(g, mt);
gray2black(o); gray2black(o);
g->GCmemtrav += sizeudata(gco2u(o)); g->GCmemtrav += sizeudata(gco2u(o));
/* markobject(g, gco2u(o)->env); */
o = obj2gco(gco2u(o)->env); o = obj2gco(gco2u(o)->env);
if (o && iswhite(o)) if (o && iswhite(o))
goto reentry; goto reentry; /* reallymarkobject(g, gco2u(o)->env); */
return; break;
} }
case LUA_TLCL: { case LUA_TLCL: {
gco2lcl(o)->gclist = g->gray; gco2lcl(o)->gclist = g->gray;
g->gray = o; g->gray = o;
return; break;
} }
case LUA_TCCL: { case LUA_TCCL: {
gco2ccl(o)->gclist = g->gray; gco2ccl(o)->gclist = g->gray;
g->gray = o; g->gray = o;
return; break;
} }
case LUA_TTABLE: { case LUA_TTABLE: {
linktable(gco2t(o), &g->gray); linktable(gco2t(o), &g->gray);
return; break;
} }
case LUA_TTHREAD: { case LUA_TTHREAD: {
gco2th(o)->gclist = g->gray; gco2th(o)->gclist = g->gray;
g->gray = o; g->gray = o;
return; break;
} }
case LUA_TPROTO: { case LUA_TPROTO: {
gco2p(o)->gclist = g->gray; gco2p(o)->gclist = g->gray;
g->gray = o; g->gray = o;
return; break;
} }
default: lua_assert(0); return; default: lua_assert(0); break;
} }
gray2black(o);
g->GCmemtrav += size;
} }