mirror of https://github.com/rusefi/lua.git
no more attempt to optimize GC when parsing new modules (too complex)
This commit is contained in:
parent
60d11ec316
commit
ea16ee41a8
19
ldo.c
19
ldo.c
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
** $Id: ldo.c,v 1.213 2003/02/13 16:08:47 roberto Exp roberto $
|
** $Id: ldo.c,v 1.214 2003/02/27 11:52:30 roberto Exp roberto $
|
||||||
** Stack and Call structure of Lua
|
** Stack and Call structure of Lua
|
||||||
** See Copyright Notice in lua.h
|
** See Copyright Notice in lua.h
|
||||||
*/
|
*/
|
||||||
|
@ -428,22 +428,13 @@ struct SParser { /* data to `f_parser' */
|
||||||
};
|
};
|
||||||
|
|
||||||
static void f_parser (lua_State *L, void *ud) {
|
static void f_parser (lua_State *L, void *ud) {
|
||||||
lu_mem old_blocks;
|
|
||||||
Proto *tf;
|
|
||||||
Closure *cl;
|
|
||||||
struct SParser *p = cast(struct SParser *, ud);
|
struct SParser *p = cast(struct SParser *, ud);
|
||||||
/* before parsing, give a (good) chance to GC */
|
Proto *tf = p->bin ? luaU_undump(L, p->z, &p->buff) :
|
||||||
if (G(L)->nblocks + G(L)->nblocks/4 >= G(L)->GCthreshold)
|
luaY_parser(L, p->z, &p->buff);
|
||||||
luaC_collectgarbage(L);
|
Closure *cl = luaF_newLclosure(L, 0, gt(L));
|
||||||
old_blocks = G(L)->nblocks;
|
|
||||||
tf = p->bin ? luaU_undump(L, p->z, &p->buff) : luaY_parser(L, p->z, &p->buff);
|
|
||||||
cl = luaF_newLclosure(L, 0, gt(L));
|
|
||||||
cl->l.p = tf;
|
cl->l.p = tf;
|
||||||
setclvalue(L->top, cl);
|
setclvalue(L->top, cl);
|
||||||
incr_top(L);
|
incr_top(L);
|
||||||
/* add new memory to threshold (as it probably will stay) */
|
|
||||||
lua_assert(G(L)->nblocks >= old_blocks);
|
|
||||||
G(L)->GCthreshold += (G(L)->nblocks - old_blocks);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -455,7 +446,7 @@ int luaD_protectedparser (lua_State *L, ZIO *z, int bin) {
|
||||||
luaZ_initbuffer(L, &p.buff);
|
luaZ_initbuffer(L, &p.buff);
|
||||||
status = luaD_rawrunprotected(L, f_parser, &p);
|
status = luaD_rawrunprotected(L, f_parser, &p);
|
||||||
luaZ_freebuffer(L, &p.buff);
|
luaZ_freebuffer(L, &p.buff);
|
||||||
if (status != 0) { /* error */
|
if (status != 0) { /* error? */
|
||||||
StkId oldtop = restorestack(L, oldtopr);
|
StkId oldtop = restorestack(L, oldtopr);
|
||||||
seterrorobj(L, status, oldtop);
|
seterrorobj(L, status, oldtop);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue