nik/lush
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid luaS_resize (which may need extra memory) during `main' activities

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2002-09-05 16:57:40 -03:00
parent 728fa167d2
commit afe1305b1a
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lgc.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lgc.c,v 1.148 2002/08/30 19:09:21 roberto Exp roberto $ ** $Id: lgc.c,v 1.149 2002/09/02 19:54:49 roberto Exp roberto $
** Garbage Collector ** Garbage Collector
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -331,15 +331,16 @@ static void sweepstrings (lua_State *L, int all) {
for (i=0; i<G(L)->strt.size; i++) { /* for each list */ for (i=0; i<G(L)->strt.size; i++) { /* for each list */
G(L)->strt.nuse -= sweeplist(L, &G(L)->strt.hash[i], all); G(L)->strt.nuse -= sweeplist(L, &G(L)->strt.hash[i], all);
} }
if (G(L)->strt.nuse < cast(ls_nstr, G(L)->strt.size/4) &&
G(L)->strt.size > MINSTRTABSIZE*2)
luaS_resize(L, G(L)->strt.size/2); /* table is too big */
} }
#define MINBUFFER 256 #define MINBUFFER 256
static void checkMbuffer (lua_State *L) { static void checkSizes (lua_State *L) {
/* check size of string hash */
if (G(L)->strt.nuse < cast(ls_nstr, G(L)->strt.size/4) &&
G(L)->strt.size > MINSTRTABSIZE*2)
luaS_resize(L, G(L)->strt.size/2); /* table is too big */
/* check size of buffer */
if (G(L)->Mbuffsize > MINBUFFER*2) { /* is buffer too big? */ if (G(L)->Mbuffsize > MINBUFFER*2) { /* is buffer too big? */
size_t newsize = G(L)->Mbuffsize/2; /* still larger than MINBUFFER */ size_t newsize = G(L)->Mbuffsize/2; /* still larger than MINBUFFER */
luaM_reallocvector(L, G(L)->Mbuffer, G(L)->Mbuffsize, newsize, char); luaM_reallocvector(L, G(L)->Mbuffer, G(L)->Mbuffsize, newsize, char);
@@ -406,7 +407,7 @@ void luaC_collectgarbage (lua_State *L) {
cleartablevalues(&st); /* again, for eventual weak preserved tables */ cleartablevalues(&st); /* again, for eventual weak preserved tables */
cleartablekeys(&st); cleartablekeys(&st);
luaC_sweep(L, 0); luaC_sweep(L, 0);
checkMbuffer(L); checkSizes(L);
G(L)->GCthreshold = 2*G(L)->nblocks; /* new threshold */ G(L)->GCthreshold = 2*G(L)->nblocks; /* new threshold */
callGCTM(L); callGCTM(L);
} }