From e23da9edee5034dd62d09f44cd2e9a8a3e32dedd Mon Sep 17 00:00:00 2001 From: Roberto Ierusalimschy Date: Fri, 1 Aug 2008 14:01:16 -0300 Subject: [PATCH] GC step does not unblock collector (when it is blocked by "stop") --- lapi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lapi.c b/lapi.c index 7b679ef4..9af75b17 100644 --- a/lapi.c +++ b/lapi.c @@ -1,5 +1,5 @@ /* -** $Id: lapi.c,v 2.66 2008/02/19 18:55:09 roberto Exp roberto $ +** $Id: lapi.c,v 2.67 2008/07/04 18:27:11 roberto Exp roberto $ ** Lua API ** See Copyright Notice in lua.h */ @@ -906,6 +906,7 @@ LUA_API int lua_gc (lua_State *L, int what, int data) { break; } case LUA_GCSTEP: { + lu_mem oldts = g->GCthreshold; lu_mem a = (cast(lu_mem, data) << 10); g->GCthreshold = (a <= g->totalbytes) ? g->totalbytes - a : 0; while (g->GCthreshold <= g->totalbytes) { @@ -915,6 +916,8 @@ LUA_API int lua_gc (lua_State *L, int what, int data) { break; } } + if (oldts == MAX_LUMEM) /* collector was stopped? */ + g->GCthreshold = oldts; /* keep it that way */ break; } case LUA_GCSETPAUSE: {