GitHub/lua
1
0
Fork 0
mirror of https://github.com/lua/lua.git synced 2025-01-14 05:43:00 +08:00
Code Issues Projects Releases Wiki Activity

only count in 'atomic' objects marked for the first time

Browse Source
This commit is contained in:
Roberto Ierusalimschy 2012-05-29 14:52:17 -03:00
parent 51e8f08e60
commit 6efffb9acd
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lgc.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lgc.c,v 2.128 2012/05/23 15:43:14 roberto Exp roberto $ ** $Id: lgc.c,v 2.129 2012/05/28 20:41:00 roberto Exp roberto $
** Garbage Collector ** Garbage Collector
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -962,7 +962,7 @@ void luaC_freeallobjects (lua_State *L) {
static l_mem atomic (lua_State *L) { static l_mem atomic (lua_State *L) {
global_State *g = G(L); global_State *g = G(L);
l_mem trav = g->GCmemtrav; l_mem trav = -g->GCmemtrav; /* start counting work */
GCObject *origweak, *origall; GCObject *origweak, *origall;
lua_assert(!iswhite(obj2gco(g->mainthread))); lua_assert(!iswhite(obj2gco(g->mainthread)));
markobject(g, L); /* mark running thread */ markobject(g, L); /* mark running thread */
@ -971,6 +971,8 @@ static l_mem atomic (lua_State *L) {
markmt(g); /* mark basic metatables */ markmt(g); /* mark basic metatables */
/* remark occasional upvalues of (maybe) dead threads */ /* remark occasional upvalues of (maybe) dead threads */
remarkupvals(g); remarkupvals(g);
propagateall(g); /* propagate changes */
trav += g->GCmemtrav; /* count work done til now */
/* traverse objects caught by write barrier and by 'remarkupvals' */ /* traverse objects caught by write barrier and by 'remarkupvals' */
retraversegrays(g); retraversegrays(g);
convergeephemerons(g); convergeephemerons(g);
@ -979,10 +981,11 @@ static l_mem atomic (lua_State *L) {
clearvalues(g, g->weak, NULL); clearvalues(g, g->weak, NULL);
clearvalues(g, g->allweak, NULL); clearvalues(g, g->allweak, NULL);
origweak = g->weak; origall = g->allweak; origweak = g->weak; origall = g->allweak;
trav -= g->GCmemtrav; /* restart counting work */
separatetobefnz(L, 0); /* separate objects to be finalized */ separatetobefnz(L, 0); /* separate objects to be finalized */
markbeingfnz(g); /* mark userdata that will be finalized */ markbeingfnz(g); /* mark objects that will be finalized */
propagateall(g); /* remark, to propagate `preserveness' */ propagateall(g); /* remark, to propagate `preserveness' */
trav = g->GCmemtrav - trav; /* avoid adding convergence twice */ trav += g->GCmemtrav; /* add work done til now */
convergeephemerons(g); convergeephemerons(g);
/* at this point, all resurrected objects are marked. */ /* at this point, all resurrected objects are marked. */
/* remove dead objects from weak tables */ /* remove dead objects from weak tables */
@ -994,7 +997,7 @@ static l_mem atomic (lua_State *L) {
g->currentwhite = cast_byte(otherwhite(g)); /* flip current white */ g->currentwhite = cast_byte(otherwhite(g)); /* flip current white */
entersweep(L); /* prepare to sweep strings */ entersweep(L); /* prepare to sweep strings */
/*lua_checkmemory(L);*/ /*lua_checkmemory(L);*/
return trav; /* reasonable estimate of the work done by 'atomic' */ return trav; /* estimate of the objects marked by 'atomic' */
} }