diff options
Diffstat (limited to 'ltests.c')
-rw-r--r-- | ltests.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: ltests.c,v 2.157 2013/09/11 12:47:48 roberto Exp roberto $ | 2 | ** $Id: ltests.c,v 2.158 2013/09/11 14:09:55 roberto Exp roberto $ |
3 | ** Internal Module for Debugging of the Lua Implementation | 3 | ** Internal Module for Debugging of the Lua Implementation |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -434,14 +434,14 @@ int lua_checkmemory (lua_State *L) { | |||
434 | markgrays(g); | 434 | markgrays(g); |
435 | /* check 'localgc' list */ | 435 | /* check 'localgc' list */ |
436 | checkgray(g, g->localgc); | 436 | checkgray(g, g->localgc); |
437 | maybedead = (GCSatomic < g->gcstate && g->gcstate <= GCSsweeplocal); | 437 | maybedead = (GCSatomic < g->gcstate && g->gcstate <= GCSswplocalgc); |
438 | for (o = g->localgc; o != NULL; o = gch(o)->next) { | 438 | for (o = g->localgc; o != NULL; o = gch(o)->next) { |
439 | checkobject(g, o, maybedead); | 439 | checkobject(g, o, maybedead); |
440 | lua_assert(!tofinalize(o) && !testbit(o->gch.marked, LOCALMARK)); | 440 | lua_assert(!tofinalize(o) && !testbit(o->gch.marked, LOCALMARK)); |
441 | } | 441 | } |
442 | /* check 'allgc' list */ | 442 | /* check 'allgc' list */ |
443 | checkgray(g, g->allgc); | 443 | checkgray(g, g->allgc); |
444 | maybedead = (GCSatomic < g->gcstate && g->gcstate <= GCSsweepall); | 444 | maybedead = (GCSatomic < g->gcstate && g->gcstate <= GCSswpallgc); |
445 | for (o = g->allgc; o != NULL; o = gch(o)->next) { | 445 | for (o = g->allgc; o != NULL; o = gch(o)->next) { |
446 | checkobject(g, o, maybedead); | 446 | checkobject(g, o, maybedead); |
447 | lua_assert(!tofinalize(o) && testbit(o->gch.marked, LOCALMARK)); | 447 | lua_assert(!tofinalize(o) && testbit(o->gch.marked, LOCALMARK)); |
@@ -449,7 +449,7 @@ int lua_checkmemory (lua_State *L) { | |||
449 | } | 449 | } |
450 | /* check thread list */ | 450 | /* check thread list */ |
451 | checkgray(g, obj2gco(g->mainthread)); | 451 | checkgray(g, obj2gco(g->mainthread)); |
452 | maybedead = (GCSatomic < g->gcstate && g->gcstate <= GCSsweepthreads); | 452 | maybedead = (GCSatomic < g->gcstate && g->gcstate <= GCSswpthreads); |
453 | for (o = obj2gco(g->mainthread); o != NULL; o = gch(o)->next) { | 453 | for (o = obj2gco(g->mainthread); o != NULL; o = gch(o)->next) { |
454 | checkobject(g, o, maybedead); | 454 | checkobject(g, o, maybedead); |
455 | lua_assert(!tofinalize(o) && testbit(o->gch.marked, LOCALMARK)); | 455 | lua_assert(!tofinalize(o) && testbit(o->gch.marked, LOCALMARK)); |
@@ -655,8 +655,8 @@ static int gc_local (lua_State *L) { | |||
655 | 655 | ||
656 | static int gc_state (lua_State *L) { | 656 | static int gc_state (lua_State *L) { |
657 | static const char *statenames[] = {"propagate", "atomic", | 657 | static const char *statenames[] = {"propagate", "atomic", |
658 | "sweeplocal", "sweeplocfin", "sweepfin", "sweepall", | 658 | "sweeplocalgc", "sweepallgc", "sweepthreads", "sweeplocalfin", |
659 | "sweeptobefnz", "sweepthreads", "sweepend", "pause", ""}; | 659 | "sweepfinobj", "sweeptobefnz", "sweepend", "pause", ""}; |
660 | int option = luaL_checkoption(L, 1, "", statenames); | 660 | int option = luaL_checkoption(L, 1, "", statenames); |
661 | if (option == GCSpause + 1) { | 661 | if (option == GCSpause + 1) { |
662 | lua_pushstring(L, statenames[G(L)->gcstate]); | 662 | lua_pushstring(L, statenames[G(L)->gcstate]); |