aboutsummaryrefslogtreecommitdiff
path: root/lstate.c
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2013-08-21 17:09:51 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2013-08-21 17:09:51 -0300
commit0df6635711230ab306710056f621b6da59fac5ea (patch)
treed8ae245fc35157219a54407d9af6a52b42922ce1 /lstate.c
parentae800656c9f82b54f6fae1497022d3484ad0c920 (diff)
downloadlua-0df6635711230ab306710056f621b6da59fac5ea.tar.gz
lua-0df6635711230ab306710056f621b6da59fac5ea.tar.bz2
lua-0df6635711230ab306710056f621b6da59fac5ea.zip
"fixed" objects kept in a separated list (instead of being kept in
'allgc' list with a bit marking them)
Diffstat (limited to 'lstate.c')
-rw-r--r--lstate.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/lstate.c b/lstate.c
index 7753568d..c8fc27c5 100644
--- a/lstate.c
+++ b/lstate.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lstate.c,v 2.102 2013/08/16 18:55:49 roberto Exp roberto $ 2** $Id: lstate.c,v 2.103 2013/08/21 19:21:16 roberto Exp roberto $
3** Global State 3** Global State
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -188,7 +188,7 @@ static void f_luaopen (lua_State *L, void *ud) {
188 luaX_init(L); 188 luaX_init(L);
189 /* pre-create memory-error message */ 189 /* pre-create memory-error message */
190 g->memerrmsg = luaS_newliteral(L, MEMERRMSG); 190 g->memerrmsg = luaS_newliteral(L, MEMERRMSG);
191 luaS_fix(g->memerrmsg); /* it should never be collected */ 191 luaC_fix(L, obj2gco(g->memerrmsg)); /* it should never be collected */
192 g->gcrunning = 1; /* allow gc */ 192 g->gcrunning = 1; /* allow gc */
193} 193}
194 194
@@ -270,7 +270,7 @@ LUA_API lua_State *lua_newstate (lua_Alloc f, void *ud) {
270 g = &l->g; 270 g = &l->g;
271 L->next = NULL; 271 L->next = NULL;
272 L->tt = LUA_TTHREAD; 272 L->tt = LUA_TTHREAD;
273 g->currentwhite = bit2mask(WHITE0BIT, FIXEDBIT); 273 g->currentwhite = bitmask(WHITE0BIT);
274 L->marked = luaC_white(g) | bitmask(LOCALBIT); 274 L->marked = luaC_white(g) | bitmask(LOCALBIT);
275 g->gckind = KGC_NORMAL; 275 g->gckind = KGC_NORMAL;
276 preinit_state(L, g); 276 preinit_state(L, g);
@@ -290,6 +290,7 @@ LUA_API lua_State *lua_newstate (lua_Alloc f, void *ud) {
290 g->allgc = NULL; 290 g->allgc = NULL;
291 g->finobj = NULL; 291 g->finobj = NULL;
292 g->tobefnz = NULL; 292 g->tobefnz = NULL;
293 g->fixedgc = NULL;
293 g->sweepgc = g->sweepfin = NULL; 294 g->sweepgc = g->sweepfin = NULL;
294 g->gray = g->grayagain = NULL; 295 g->gray = g->grayagain = NULL;
295 g->weak = g->ephemeron = g->allweak = NULL; 296 g->weak = g->ephemeron = g->allweak = NULL;