summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2013-04-26 15:22:05 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2013-04-26 15:22:05 -0300
commitdcd35b45955b3ffe8e1f9670d625a69c646ac748 (patch)
tree13b89bd78dfba51cf77c72b4d138bdd4c04d1c19
parentc2ea18726a466fd3c84446eb002e060c04815521 (diff)
downloadlua-dcd35b45955b3ffe8e1f9670d625a69c646ac748.tar.gz
lua-dcd35b45955b3ffe8e1f9670d625a69c646ac748.tar.bz2
lua-dcd35b45955b3ffe8e1f9670d625a69c646ac748.zip
bug: garbage collector can trigger too many times in recursive loops,
because it was not computing the size of CallInfo structures in threads
-rw-r--r--lgc.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/lgc.c b/lgc.c
index 535e988a..7ee19881 100644
--- a/lgc.c
+++ b/lgc.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lgc.c,v 2.140 2013/03/16 21:10:18 roberto Exp $ 2** $Id: lgc.c,v 2.140.1.1 2013/04/12 18:48:47 roberto Exp roberto $
3** Garbage Collector 3** Garbage Collector
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -493,17 +493,24 @@ static lu_mem traverseLclosure (global_State *g, LClosure *cl) {
493 493
494 494
495static lu_mem traversestack (global_State *g, lua_State *th) { 495static lu_mem traversestack (global_State *g, lua_State *th) {
496 int n = 0;
496 StkId o = th->stack; 497 StkId o = th->stack;
497 if (o == NULL) 498 if (o == NULL)
498 return 1; /* stack not completely built yet */ 499 return 1; /* stack not completely built yet */
499 for (; o < th->top; o++) 500 for (; o < th->top; o++) /* mark live elements in the stack */
500 markvalue(g, o); 501 markvalue(g, o);
501 if (g->gcstate == GCSatomic) { /* final traversal? */ 502 if (g->gcstate == GCSatomic) { /* final traversal? */
502 StkId lim = th->stack + th->stacksize; /* real end of stack */ 503 StkId lim = th->stack + th->stacksize; /* real end of stack */
503 for (; o < lim; o++) /* clear not-marked stack slice */ 504 for (; o < lim; o++) /* clear not-marked stack slice */
504 setnilvalue(o); 505 setnilvalue(o);
505 } 506 }
506 return sizeof(lua_State) + sizeof(TValue) * th->stacksize; 507 else { /* count call infos to compute size */
508 CallInfo *ci;
509 for (ci = &th->base_ci; ci != th->ci; ci = ci->next)
510 n++;
511 }
512 return sizeof(lua_State) + sizeof(TValue) * th->stacksize +
513 sizeof(CallInfo) * n;
507} 514}
508 515
509 516