gh-mirror/mikepaul-LuaJIT
1
0
Fork 1
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-12 17:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2013-11-05 19:46:41 +01:00
commit 8a2b2beac2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lj_api.c
View File

@ -1153,7 +1153,7 @@ LUA_API int lua_gc(lua_State *L, int what, int data)
MSize a = (MSize)data << 10; MSize a = (MSize)data << 10;
g->gc.threshold = (a <= g->gc.total) ? (g->gc.total - a) : 0; g->gc.threshold = (a <= g->gc.total) ? (g->gc.total - a) : 0;
while (g->gc.total >= g->gc.threshold) while (g->gc.total >= g->gc.threshold)
if (lj_gc_step(L)) { if (lj_gc_step(L) > 0) {
res = 1; res = 1;
break; break;
} }

2
src/lj_gc.c
View File

@ -685,7 +685,7 @@ int LJ_FASTCALL lj_gc_step(lua_State *L)
if (g->gc.debt < GCSTEPSIZE) { if (g->gc.debt < GCSTEPSIZE) {
g->gc.threshold = g->gc.total + GCSTEPSIZE; g->gc.threshold = g->gc.total + GCSTEPSIZE;
g->vmstate = ostate; g->vmstate = ostate;
return 1; return -1;
} else { } else {
g->gc.debt -= GCSTEPSIZE; g->gc.debt -= GCSTEPSIZE;
g->gc.threshold = g->gc.total; g->gc.threshold = g->gc.total;