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

Cleanup of memory vs. GC sizes. No functional changes.

Browse Source
This commit is contained in:
Mike Pall 2014-12-20 00:17:50 +01:00
parent 82e6e5fb5f
commit 6e9145a882
10 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib_package.c
View File

@ -226,7 +226,7 @@ static int ll_loadfunc(lua_State *L, const char *path, const char *name, int r)
const char *bcdata = ll_bcsym(*reg, mksymname(L, name, SYMPREFIX_BC)); const char *bcdata = ll_bcsym(*reg, mksymname(L, name, SYMPREFIX_BC));
lua_pop(L, 1); lua_pop(L, 1);
if (bcdata) { if (bcdata) {
if (luaL_loadbuffer(L, bcdata, LJ_MAX_MEM, name) != 0) if (luaL_loadbuffer(L, bcdata, LJ_MAX_BUF, name) != 0)
return PACKAGE_ERR_LOAD; return PACKAGE_ERR_LOAD;
return 0; return 0;
} }
@ -383,7 +383,7 @@ static int lj_cf_package_loader_preload(lua_State *L)
if (lua_isnil(L, -1)) { /* Not found? */ if (lua_isnil(L, -1)) { /* Not found? */
const char *bcname = mksymname(L, name, SYMPREFIX_BC); const char *bcname = mksymname(L, name, SYMPREFIX_BC);
const char *bcdata = ll_bcsym(NULL, bcname); const char *bcdata = ll_bcsym(NULL, bcname);
if (bcdata == NULL || luaL_loadbuffer(L, bcdata, LJ_MAX_MEM, name) != 0) if (bcdata == NULL || luaL_loadbuffer(L, bcdata, LJ_MAX_BUF, name) != 0)
lua_pushfstring(L, "\n\tno field package.preload['%s']", name); lua_pushfstring(L, "\n\tno field package.preload['%s']", name);
} }
return 1; return 1;

2
src/lj_api.c
View File

@ -1150,7 +1150,7 @@ LUA_API int lua_gc(lua_State *L, int what, int data)
res = (int)(g->gc.total & 0x3ff); res = (int)(g->gc.total & 0x3ff);
break; break;
case LUA_GCSTEP: { case LUA_GCSTEP: {
MSize a = (MSize)data << 10; GCSize a = (GCSize)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) > 0) { if (lj_gc_step(L) > 0) {

2
src/lj_bcread.c
View File

@ -48,7 +48,7 @@ static LJ_NOINLINE void bcread_error(LexState *ls, ErrMsg em)
static LJ_NOINLINE void bcread_fill(LexState *ls, MSize len, int need) static LJ_NOINLINE void bcread_fill(LexState *ls, MSize len, int need)
{ {
lua_assert(len != 0); lua_assert(len != 0);
if (len > LJ_MAX_MEM || ls->c < 0) if (len > LJ_MAX_BUF || ls->c < 0)
bcread_error(ls, LJ_ERR_BCBAD); bcread_error(ls, LJ_ERR_BCBAD);
do { do {
const char *buf; const char *buf;

6
src/lj_buf.c
View File

@ -31,7 +31,7 @@ static void buf_grow(SBuf *sb, MSize sz)
LJ_NOINLINE char *LJ_FASTCALL lj_buf_need2(SBuf *sb, MSize sz) LJ_NOINLINE char *LJ_FASTCALL lj_buf_need2(SBuf *sb, MSize sz)
{ {
lua_assert(sz > sbufsz(sb)); lua_assert(sz > sbufsz(sb));
if (LJ_UNLIKELY(sz > LJ_MAX_MEM)) if (LJ_UNLIKELY(sz > LJ_MAX_BUF))
lj_err_mem(sbufL(sb)); lj_err_mem(sbufL(sb));
buf_grow(sb, sz); buf_grow(sb, sz);
return sbufB(sb); return sbufB(sb);
@ -41,7 +41,7 @@ LJ_NOINLINE char *LJ_FASTCALL lj_buf_more2(SBuf *sb, MSize sz)
{ {
MSize len = sbuflen(sb); MSize len = sbuflen(sb);
lua_assert(sz > sbufleft(sb)); lua_assert(sz > sbufleft(sb));
if (LJ_UNLIKELY(sz > LJ_MAX_MEM || len + sz > LJ_MAX_MEM)) if (LJ_UNLIKELY(sz > LJ_MAX_BUF || len + sz > LJ_MAX_BUF))
lj_err_mem(sbufL(sb)); lj_err_mem(sbufL(sb));
buf_grow(sb, len + sz); buf_grow(sb, len + sz);
return sbufP(sb); return sbufP(sb);
@ -178,7 +178,7 @@ SBuf *lj_buf_puttab(SBuf *sb, GCtab *t, GCstr *sep, int32_t i, int32_t e)
char *p; char *p;
if (!o) { if (!o) {
badtype: /* Error: bad element type. */ badtype: /* Error: bad element type. */
setsbufP(sb, (intptr_t)i); /* Store failing index. */ setsbufP(sb, (void *)(intptr_t)i); /* Store failing index. */
return NULL; return NULL;
} else if (tvisstr(o)) { } else if (tvisstr(o)) {
MSize len = strV(o)->len; MSize len = strV(o)->len;

11
src/lj_def.h
View File

@ -46,10 +46,12 @@ typedef unsigned int uintptr_t;
#include <stdlib.h> #include <stdlib.h>
/* Various VM limits. */ /* Various VM limits. */
#define LJ_MAX_MEM 0x7fffff00 /* Max. total memory allocation. */ #define LJ_MAX_MEM32 0x7fffff00 /* Max. 32 bit memory allocation. */
#define LJ_MAX_MEM LJ_MAX_MEM32 /* Max. total memory allocation. */
#define LJ_MAX_ALLOC LJ_MAX_MEM /* Max. individual allocation length. */ #define LJ_MAX_ALLOC LJ_MAX_MEM /* Max. individual allocation length. */
#define LJ_MAX_STR LJ_MAX_MEM /* Max. string length. */ #define LJ_MAX_STR LJ_MAX_MEM32 /* Max. string length. */
#define LJ_MAX_UDATA LJ_MAX_MEM /* Max. userdata length. */ #define LJ_MAX_BUF LJ_MAX_MEM32 /* Max. buffer length. */
#define LJ_MAX_UDATA LJ_MAX_MEM32 /* Max. userdata length. */
#define LJ_MAX_STRTAB (1<<26) /* Max. string table size. */ #define LJ_MAX_STRTAB (1<<26) /* Max. string table size. */
#define LJ_MAX_HBITS 26 /* Max. hash bits. */ #define LJ_MAX_HBITS 26 /* Max. hash bits. */
@ -57,7 +59,7 @@ typedef unsigned int uintptr_t;
#define LJ_MAX_ASIZE ((1<<(LJ_MAX_ABITS-1))+1) /* Max. array part size. */ #define LJ_MAX_ASIZE ((1<<(LJ_MAX_ABITS-1))+1) /* Max. array part size. */
#define LJ_MAX_COLOSIZE 16 /* Max. elems for colocated array. */ #define LJ_MAX_COLOSIZE 16 /* Max. elems for colocated array. */
#define LJ_MAX_LINE LJ_MAX_MEM /* Max. source code line number. */ #define LJ_MAX_LINE LJ_MAX_MEM32 /* Max. source code line number. */
#define LJ_MAX_XLEVEL 200 /* Max. syntactic nesting level. */ #define LJ_MAX_XLEVEL 200 /* Max. syntactic nesting level. */
#define LJ_MAX_BCINS (1<<26) /* Max. # of bytecode instructions. */ #define LJ_MAX_BCINS (1<<26) /* Max. # of bytecode instructions. */
#define LJ_MAX_SLOTS 250 /* Max. # of slots in a Lua func. */ #define LJ_MAX_SLOTS 250 /* Max. # of slots in a Lua func. */
@ -99,6 +101,7 @@ typedef unsigned int uintptr_t;
#define checki32(x) ((x) == (int32_t)(x)) #define checki32(x) ((x) == (int32_t)(x))
#define checku32(x) ((x) == (uint32_t)(x)) #define checku32(x) ((x) == (uint32_t)(x))
#define checkptr32(x) ((uintptr_t)(x) == (uint32_t)(uintptr_t)(x)) #define checkptr32(x) ((uintptr_t)(x) == (uint32_t)(uintptr_t)(x))
#define checkptrGC(x) (checkptr32(x))
/* Every half-decent C compiler transforms this into a rotate instruction. */ /* Every half-decent C compiler transforms this into a rotate instruction. */
#define lj_rol(x, n) (((x)<<(n)) | ((x)>>(-(int)(n)&(8*sizeof(x)-1)))) #define lj_rol(x, n) (((x)<<(n)) | ((x)>>(-(int)(n)&(8*sizeof(x)-1))))

24
src/lj_gc.c
View File

@ -374,7 +374,7 @@ static const GCFreeFunc gc_freefunc[] = {
}; };
/* Full sweep of a GC list. */ /* Full sweep of a GC list. */
#define gc_fullsweep(g, p) gc_sweep(g, (p), LJ_MAX_MEM) #define gc_fullsweep(g, p) gc_sweep(g, (p), ~(uint32_t)0)
/* Partial sweep of a GC list. */ /* Partial sweep of a GC list. */
static GCRef *gc_sweep(global_State *g, GCRef *p, uint32_t lim) static GCRef *gc_sweep(global_State *g, GCRef *p, uint32_t lim)
@ -452,7 +452,7 @@ static void gc_call_finalizer(global_State *g, lua_State *L,
{ {
/* Save and restore lots of state around the __gc callback. */ /* Save and restore lots of state around the __gc callback. */
uint8_t oldh = hook_save(g); uint8_t oldh = hook_save(g);
MSize oldt = g->gc.threshold; GCSize oldt = g->gc.threshold;
int errcode; int errcode;
TValue *top; TValue *top;
lj_trace_abort(g); lj_trace_abort(g);
@ -590,7 +590,7 @@ static void atomic(global_State *g, lua_State *L)
g->gc.currentwhite = (uint8_t)otherwhite(g); /* Flip current white. */ g->gc.currentwhite = (uint8_t)otherwhite(g); /* Flip current white. */
g->strempty.marked = g->gc.currentwhite; g->strempty.marked = g->gc.currentwhite;
setmref(g->gc.sweep, &g->gc.root); setmref(g->gc.sweep, &g->gc.root);
g->gc.estimate = g->gc.total - (MSize)udsize; /* Initial estimate. */ g->gc.estimate = g->gc.total - (GCSize)udsize; /* Initial estimate. */
} }
/* GC state machine. Returns a cost estimate for each step performed. */ /* GC state machine. Returns a cost estimate for each step performed. */
@ -614,7 +614,7 @@ static size_t gc_onestep(lua_State *L)
g->gc.sweepstr = 0; g->gc.sweepstr = 0;
return 0; return 0;
case GCSsweepstring: { case GCSsweepstring: {
MSize old = g->gc.total; GCSize old = g->gc.total;
gc_fullsweep(g, &g->strhash[g->gc.sweepstr++]); /* Sweep one chain. */ gc_fullsweep(g, &g->strhash[g->gc.sweepstr++]); /* Sweep one chain. */
if (g->gc.sweepstr > g->strmask) if (g->gc.sweepstr > g->strmask)
g->gc.state = GCSsweep; /* All string hash chains sweeped. */ g->gc.state = GCSsweep; /* All string hash chains sweeped. */
@ -623,7 +623,7 @@ static size_t gc_onestep(lua_State *L)
return GCSWEEPCOST; return GCSWEEPCOST;
} }
case GCSsweep: { case GCSsweep: {
MSize old = g->gc.total; GCSize old = g->gc.total;
setmref(g->gc.sweep, gc_sweep(g, mref(g->gc.sweep, GCRef), GCSWEEPMAX)); setmref(g->gc.sweep, gc_sweep(g, mref(g->gc.sweep, GCRef), GCSWEEPMAX));
lua_assert(old >= g->gc.total); lua_assert(old >= g->gc.total);
g->gc.estimate -= old - g->gc.total; g->gc.estimate -= old - g->gc.total;
@ -667,7 +667,7 @@ static size_t gc_onestep(lua_State *L)
int LJ_FASTCALL lj_gc_step(lua_State *L) int LJ_FASTCALL lj_gc_step(lua_State *L)
{ {
global_State *g = G(L); global_State *g = G(L);
MSize lim; GCSize lim;
int32_t ostate = g->vmstate; int32_t ostate = g->vmstate;
setvmstate(g, GC); setvmstate(g, GC);
lim = (GCSTEPSIZE/100) * g->gc.stepmul; lim = (GCSTEPSIZE/100) * g->gc.stepmul;
@ -676,13 +676,13 @@ int LJ_FASTCALL lj_gc_step(lua_State *L)
if (g->gc.total > g->gc.threshold) if (g->gc.total > g->gc.threshold)
g->gc.debt += g->gc.total - g->gc.threshold; g->gc.debt += g->gc.total - g->gc.threshold;
do { do {
lim -= (MSize)gc_onestep(L); lim -= (GCSize)gc_onestep(L);
if (g->gc.state == GCSpause) { if (g->gc.state == GCSpause) {
g->gc.threshold = (g->gc.estimate/100) * g->gc.pause; g->gc.threshold = (g->gc.estimate/100) * g->gc.pause;
g->vmstate = ostate; g->vmstate = ostate;
return 1; /* Finished a GC cycle. */ return 1; /* Finished a GC cycle. */
} }
} while ((int32_t)lim > 0); } while (sizeof(lim) == 8 ? ((int64_t)lim > 0) : ((int32_t)lim > 0));
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;
@ -801,7 +801,7 @@ void lj_gc_barriertrace(global_State *g, uint32_t traceno)
/* -- Allocator ----------------------------------------------------------- */ /* -- Allocator ----------------------------------------------------------- */
/* Call pluggable memory allocator to allocate or resize a fragment. */ /* Call pluggable memory allocator to allocate or resize a fragment. */
void *lj_mem_realloc(lua_State *L, void *p, MSize osz, MSize nsz) void *lj_mem_realloc(lua_State *L, void *p, GCSize osz, GCSize nsz)
{ {
global_State *g = G(L); global_State *g = G(L);
lua_assert((osz == 0) == (p == NULL)); lua_assert((osz == 0) == (p == NULL));
@ -809,19 +809,19 @@ void *lj_mem_realloc(lua_State *L, void *p, MSize osz, MSize nsz)
if (p == NULL && nsz > 0) if (p == NULL && nsz > 0)
lj_err_mem(L); lj_err_mem(L);
lua_assert((nsz == 0) == (p == NULL)); lua_assert((nsz == 0) == (p == NULL));
lua_assert(checkptr32(p)); lua_assert(checkptrGC(p));
g->gc.total = (g->gc.total - osz) + nsz; g->gc.total = (g->gc.total - osz) + nsz;
return p; return p;
} }
/* Allocate new GC object and link it to the root set. */ /* Allocate new GC object and link it to the root set. */
void * LJ_FASTCALL lj_mem_newgco(lua_State *L, MSize size) void * LJ_FASTCALL lj_mem_newgco(lua_State *L, GCSize size)
{ {
global_State *g = G(L); global_State *g = G(L);
GCobj *o = (GCobj *)g->allocf(g->allocd, NULL, 0, size); GCobj *o = (GCobj *)g->allocf(g->allocd, NULL, 0, size);
if (o == NULL) if (o == NULL)
lj_err_mem(L); lj_err_mem(L);
lua_assert(checkptr32(o)); lua_assert(checkptrGC(o));
g->gc.total += size; g->gc.total += size;
setgcrefr(o->gch.nextgc, g->gc.root); setgcrefr(o->gch.nextgc, g->gc.root);
setgcref(g->gc.root, o); setgcref(g->gc.root, o);

10
src/lj_gc.h
View File

@ -107,8 +107,8 @@ static LJ_AINLINE void lj_gc_barrierback(global_State *g, GCtab *t)
lj_gc_barrierf(G(L), obj2gco(p), obj2gco(o)); } lj_gc_barrierf(G(L), obj2gco(p), obj2gco(o)); }
/* Allocator. */ /* Allocator. */
LJ_FUNC void *lj_mem_realloc(lua_State *L, void *p, MSize osz, MSize nsz); LJ_FUNC void *lj_mem_realloc(lua_State *L, void *p, GCSize osz, GCSize nsz);
LJ_FUNC void * LJ_FASTCALL lj_mem_newgco(lua_State *L, MSize size); LJ_FUNC void * LJ_FASTCALL lj_mem_newgco(lua_State *L, GCSize size);
LJ_FUNC void *lj_mem_grow(lua_State *L, void *p, LJ_FUNC void *lj_mem_grow(lua_State *L, void *p,
MSize *szp, MSize lim, MSize esz); MSize *szp, MSize lim, MSize esz);
@ -116,13 +116,13 @@ LJ_FUNC void *lj_mem_grow(lua_State *L, void *p,
static LJ_AINLINE void lj_mem_free(global_State *g, void *p, size_t osize) static LJ_AINLINE void lj_mem_free(global_State *g, void *p, size_t osize)
{ {
g->gc.total -= (MSize)osize; g->gc.total -= (GCSize)osize;
g->allocf(g->allocd, p, osize, 0); g->allocf(g->allocd, p, osize, 0);
} }
#define lj_mem_newvec(L, n, t) ((t *)lj_mem_new(L, (MSize)((n)*sizeof(t)))) #define lj_mem_newvec(L, n, t) ((t *)lj_mem_new(L, (GCSize)((n)*sizeof(t))))
#define lj_mem_reallocvec(L, p, on, n, t) \ #define lj_mem_reallocvec(L, p, on, n, t) \
((p) = (t *)lj_mem_realloc(L, p, (on)*sizeof(t), (MSize)((n)*sizeof(t)))) ((p) = (t *)lj_mem_realloc(L, p, (on)*sizeof(t), (GCSize)((n)*sizeof(t))))
#define lj_mem_growvec(L, p, n, m, t) \ #define lj_mem_growvec(L, p, n, m, t) \
((p) = (t *)lj_mem_grow(L, (p), &(n), (m), (MSize)sizeof(t))) ((p) = (t *)lj_mem_grow(L, (p), &(n), (m), (MSize)sizeof(t)))
#define lj_mem_freevec(g, p, n, t) lj_mem_free(g, (p), (n)*sizeof(t)) #define lj_mem_freevec(g, p, n, t) lj_mem_free(g, (p), (n)*sizeof(t))

2
src/lj_ir.c
View File

@ -253,7 +253,7 @@ TRef lj_ir_k64(jit_State *J, IROp op, cTValue *tv)
goto found; goto found;
ref = ir_nextk(J); ref = ir_nextk(J);
ir = IR(ref); ir = IR(ref);
lua_assert(checkptr32(tv)); lua_assert(checkptrGC(tv));
setmref(ir->ptr, tv); setmref(ir->ptr, tv);
ir->t.irt = t; ir->t.irt = t;
ir->o = op; ir->o = op;

11
src/lj_obj.h
View File

@ -15,8 +15,9 @@
/* -- Memory references (32 bit address space) ---------------------------- */ /* -- Memory references (32 bit address space) ---------------------------- */
/* Memory size. */ /* Memory and GC object sizes. */
typedef uint32_t MSize; typedef uint32_t MSize;
typedef uint32_t GCSize;
/* Memory reference */ /* Memory reference */
typedef struct MRef { typedef struct MRef {
@ -490,8 +491,8 @@ typedef enum {
#define mmname_str(g, mm) (strref((g)->gcroot[GCROOT_MMNAME+(mm)])) #define mmname_str(g, mm) (strref((g)->gcroot[GCROOT_MMNAME+(mm)]))
typedef struct GCState { typedef struct GCState {
MSize total; /* Memory currently allocated. */ GCSize total; /* Memory currently allocated. */
MSize threshold; /* Memory threshold. */ GCSize threshold; /* Memory threshold. */
uint8_t currentwhite; /* Current white color. */ uint8_t currentwhite; /* Current white color. */
uint8_t state; /* GC state. */ uint8_t state; /* GC state. */
uint8_t nocdatafin; /* No cdata finalizer called. */ uint8_t nocdatafin; /* No cdata finalizer called. */
@ -503,9 +504,9 @@ typedef struct GCState {
GCRef grayagain; /* List of objects for atomic traversal. */ GCRef grayagain; /* List of objects for atomic traversal. */
GCRef weak; /* List of weak tables (to be cleared). */ GCRef weak; /* List of weak tables (to be cleared). */
GCRef mmudata; /* List of userdata (to be finalized). */ GCRef mmudata; /* List of userdata (to be finalized). */
GCSize debt; /* Debt (how much GC is behind schedule). */
GCSize estimate; /* Estimate of memory actually in use. */
MSize stepmul; /* Incremental GC step granularity. */ MSize stepmul; /* Incremental GC step granularity. */
MSize debt; /* Debt (how much GC is behind schedule). */
MSize estimate; /* Estimate of memory actually in use. */
MSize pause; /* Pause between successive GC cycles. */ MSize pause; /* Pause between successive GC cycles. */
} GCState; } GCState;

2
src/lj_state.c
View File

@ -187,7 +187,7 @@ LUA_API lua_State *lua_newstate(lua_Alloc f, void *ud)
GG_State *GG = (GG_State *)f(ud, NULL, 0, sizeof(GG_State)); GG_State *GG = (GG_State *)f(ud, NULL, 0, sizeof(GG_State));
lua_State *L = &GG->L; lua_State *L = &GG->L;
global_State *g = &GG->g; global_State *g = &GG->g;
if (GG == NULL || !checkptr32(GG)) return NULL; if (GG == NULL || !checkptrGC(GG)) return NULL;
memset(GG, 0, sizeof(GG_State)); memset(GG, 0, sizeof(GG_State));
L->gct = ~LJ_TTHREAD; L->gct = ~LJ_TTHREAD;
L->marked = LJ_GC_WHITE0 | LJ_GC_FIXED | LJ_GC_SFIXED; /* Prevent free. */ L->marked = LJ_GC_WHITE0 | LJ_GC_FIXED | LJ_GC_SFIXED; /* Prevent free. */