no need of a KGC_FORCED collection kind; it has the same behavior of

a normal collection

2 files changed, 7 insertions, 9 deletions

diff --git a/lgc.c b/lgc.c
index ab3d0ace..d49a5f9d 100644
--- a/lgc.c
+++ b/lgc.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lgc.c,v 2.84 2010/05/03 11:55:40 roberto Exp roberto $
+** $Id: lgc.c,v 2.85 2010/05/03 17:33:39 roberto Exp roberto $
 ** Garbage Collector
 ** See Copyright Notice in lua.h
 */
@@ -899,7 +899,6 @@ static void generationalcollection (lua_State *L) {
 static void step (lua_State *L) {
   global_State *g = G(L);
   l_mem lim = g->gcstepmul;  /* how much to work */
-  lua_assert(g->gckind == KGC_NORMAL);
   do {  /* always perform at least one single step */
     lim -= singlestep(L);
   } while (lim > 0 && g->gcstate != GCSpause);
@@ -926,10 +925,10 @@ void luaC_step (lua_State *L) {
 void luaC_fullgc (lua_State *L, int isemergency) {
   global_State *g = G(L);
   int origkind = g->gckind;
-  lua_assert(origkind == KGC_NORMAL || origkind == KGC_GEN);
+  lua_assert(origkind != KGC_EMERGENCY);
   if (!isemergency)   /* do not run finalizers during emergency GC */
     callallpendingfinalizers(L, 1);
-  g->gckind = isemergency ? KGC_EMERGENCY : KGC_FORCED;
+  g->gckind = isemergency ? KGC_EMERGENCY : KGC_NORMAL;
   if (g->gcstate == GCSpropagate) {  /* marking phase? */
     /* must sweep all objects to turn them back to white
        (as white has not changed, nothing will be collected) */
@@ -945,7 +944,7 @@ void luaC_fullgc (lua_State *L, int isemergency) {
   if (!isemergency)   /* do not run finalizers during emergency GC */
     callallpendingfinalizers(L, 1);
   if (origkind == KGC_GEN) {  /* generational mode? */
-    /* collector must be always in propagate phase */
+    /* generational mode must always start in propagate phase */
     luaC_runtilstate(L, bitmask(GCSpropagate));
   }
   g->GCdebt = stddebt(g);
diff --git a/lstate.h b/lstate.h
index 28fd8d92..452046fb 100644
--- a/lstate.h
+++ b/lstate.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lstate.h,v 2.63 2010/04/13 20:48:12 roberto Exp roberto $
+** $Id: lstate.h,v 2.64 2010/04/29 17:31:31 roberto Exp roberto $
 ** Global State
 ** See Copyright Notice in lua.h
 */
@@ -54,9 +54,8 @@ struct lua_longjmp;  /* defined in ldo.c */
 
 /* kinds of Garbage Collection */
 #define KGC_NORMAL      0
-#define KGC_FORCED      1       /* gc was forced by the program */
-#define KGC_EMERGENCY   2       /* gc was forced by an allocation failure */
-#define KGC_GEN         3       /* generational collection */
+#define KGC_EMERGENCY   1       /* gc was forced by an allocation failure */
+#define KGC_GEN         2       /* generational collection */
 
 
 typedef struct stringtable {