option to return GC to normal (incremental, non generational) mode

3 files changed, 11 insertions, 5 deletions

diff --git a/lapi.c b/lapi.c
index 4a96b9a4..7a91185a 100644
--- a/lapi.c
+++ b/lapi.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lapi.c,v 2.117 2010/03/26 20:58:11 roberto Exp roberto $
+** $Id: lapi.c,v 2.118 2010/03/29 17:43:14 roberto Exp roberto $
 ** Lua API
 ** See Copyright Notice in lua.h
 */
@@ -952,6 +952,10 @@ LUA_API int lua_gc (lua_State *L, int what, int data) {
       g->gckind = KGC_GEN;
       break;
     }
+    case LUA_GCINC: {  /* change collector to incremental mode */
+      g->gckind = KGC_NORMAL;
+      break;
+    }
     default: res = -1;  /* invalid option */
   }
   lua_unlock(L);
diff --git a/lbaselib.c b/lbaselib.c
index 0f74f53e..a918b2a6 100644
--- a/lbaselib.c
+++ b/lbaselib.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lbaselib.c,v 1.239 2010/03/22 18:28:03 roberto Exp roberto $
+** $Id: lbaselib.c,v 1.240 2010/03/26 20:58:11 roberto Exp roberto $
 ** Basic library
 ** See Copyright Notice in lua.h
 */
@@ -148,10 +148,11 @@ static int luaB_gcinfo (lua_State *L) {
 
 static int luaB_collectgarbage (lua_State *L) {
   static const char *const opts[] = {"stop", "restart", "collect",
-    "count", "step", "setpause", "setstepmul", "isrunning", "gen", NULL};
+    "count", "step", "setpause", "setstepmul", "isrunning",
+    "gen", "inc", NULL};
   static const int optsnum[] = {LUA_GCSTOP, LUA_GCRESTART, LUA_GCCOLLECT,
     LUA_GCCOUNT, LUA_GCSTEP, LUA_GCSETPAUSE, LUA_GCSETSTEPMUL,
-    LUA_GCISRUNNING, LUA_GCGEN};
+    LUA_GCISRUNNING, LUA_GCGEN, LUA_GCINC};
   int o = optsnum[luaL_checkoption(L, 1, "collect", opts)];
   int ex = luaL_optint(L, 2, 0);
   int res = lua_gc(L, o, ex);
diff --git a/lua.h b/lua.h
index 0b3aa587..454c49da 100644
--- a/lua.h
+++ b/lua.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lua.h,v 1.264 2010/03/22 18:28:03 roberto Exp roberto $
+** $Id: lua.h,v 1.265 2010/03/26 20:58:11 roberto Exp roberto $
 ** Lua - A Scripting Language
 ** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
 ** See Copyright Notice at the end of this file
@@ -267,6 +267,7 @@ LUA_API int  (lua_status) (lua_State *L);
 #define LUA_GCSETSTEPMUL        7
 #define LUA_GCISRUNNING         8
 #define LUA_GCGEN               9
+#define LUA_GCINC               10
 
 LUA_API int (lua_gc) (lua_State *L, int what, int data);