commit d07abcc6c7064040c15444a7727c39c707130f60
parent 189378142a70398ad538af66b62430bc9ea3c645
Author: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date: Tue, 17 Feb 2009 16:47:34 -0300
finalizers always called protected
Diffstat:
2 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/lgc.c b/lgc.c
@@ -1,5 +1,5 @@
/*
-** $Id: lgc.c,v 2.46 2008/06/23 22:07:44 roberto Exp roberto $
+** $Id: lgc.c,v 2.47 2008/06/26 19:42:45 roberto Exp roberto $
** Garbage Collector
** See Copyright Notice in lua.h
*/
@@ -599,6 +599,12 @@ static Udata *udata2finalize (global_State *g) {
}
+static void dothecall (lua_State *L, void *ud) {
+ UNUSED(ud);
+ luaD_call(L, L->top - 2, 0);
+}
+
+
static void GCTM (lua_State *L) {
global_State *g = G(L);
Udata *udata = udata2finalize(g);
@@ -611,7 +617,7 @@ static void GCTM (lua_State *L) {
setobj2s(L, L->top, tm);
setuvalue(L, L->top+1, udata);
L->top += 2;
- luaD_call(L, L->top - 2, 0);
+ luaD_pcall(L, dothecall, NULL, savestack(L, L->top - 2), 0);
L->allowhook = oldah; /* restore hooks */
g->GCthreshold = oldt; /* restore threshold */
}
diff --git a/lstate.c b/lstate.c
@@ -1,5 +1,5 @@
/*
-** $Id: lstate.c,v 2.46 2008/08/13 17:01:33 roberto Exp roberto $
+** $Id: lstate.c,v 2.47 2008/08/26 13:27:42 roberto Exp roberto $
** Global State
** See Copyright Notice in lua.h
*/
@@ -199,25 +199,13 @@ LUA_API lua_State *lua_newstate (lua_Alloc f, void *ud) {
}
-static void callallgcTM (lua_State *L, void *ud) {
- UNUSED(ud);
- luaC_callAllGCTM(L); /* call GC metamethods for all udata */
-}
-
-
LUA_API void lua_close (lua_State *L) {
L = G(L)->mainthread; /* only the main thread can be closed */
lua_lock(L);
luaF_close(L, L->stack); /* close all upvalues for this thread */
luaC_separateudata(L, 1); /* separate all udata with GC metamethods */
lua_assert(L->next == NULL);
- L->errfunc = 0; /* no error function during GC metamethods */
- do { /* repeat until no more errors */
- L->ci = L->base_ci;
- L->base = L->top = L->ci->base;
- G(L)->nCcalls = 0;
- } while (luaD_rawrunprotected(L, callallgcTM, NULL) != LUA_OK);
- lua_assert(G(L)->tobefnz == NULL);
+ luaC_callAllGCTM(L); /* call GC metamethods for all udata */
luai_userstateclose(L);
close_state(L);
}