hyung-hwan/hawk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

touched up gc code

Browse Source
This commit is contained in:
hyung-hwan 2020-03-25 17:05:48 +00:00
parent d448f8d8bc
commit 752b1332c9
3 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hawk/lib/hawk-prv.h
View File

@ -405,9 +405,9 @@ struct hawk_rtx_t
struct struct
{ {
int collecting;
hawk_oow_t c[HAWK_GC_NUM_GENS]; /* number of values in each list */
hawk_gch_t g[HAWK_GC_NUM_GENS]; /* lists of values under gc management */ hawk_gch_t g[HAWK_GC_NUM_GENS]; /* lists of values under gc management */
hawk_oow_t nv[HAWK_GC_NUM_GENS]; /* number of values in each list */
hawk_oow_t nc[HAWK_GC_NUM_GENS]; /* number of collections performed for each generation */
} gc; } gc;
hawk_nde_blk_t* active_block; hawk_nde_blk_t* active_block;

8
hawk/lib/run.c
View File

@ -1032,13 +1032,15 @@ static int init_rtx (hawk_rtx_t* rtx, hawk_t* awk, hawk_rio_cbs_t* rio)
rtx->vmgr.rchunk = HAWK_NULL; rtx->vmgr.rchunk = HAWK_NULL;
rtx->vmgr.rfree = HAWK_NULL; rtx->vmgr.rfree = HAWK_NULL;
/* initialize circular doubly-linked list */
rtx->gc.collecting = 0;
for (i = 0; i < HAWK_COUNTOF(rtx->gc.g); i++) for (i = 0; i < HAWK_COUNTOF(rtx->gc.g); i++)
{ {
rtx->gc.c[i] = 0; /* initialize circular doubly-linked list */
rtx->gc.g[i].gc_next = &rtx->gc.g[i]; rtx->gc.g[i].gc_next = &rtx->gc.g[i];
rtx->gc.g[i].gc_prev = &rtx->gc.g[i]; rtx->gc.g[i].gc_prev = &rtx->gc.g[i];
/* initialize some counters */
rtx->gc.nv[i] = 0;
rtx->gc.nc[i] = 0;
} }
rtx->inrec.buf_pos = 0; rtx->inrec.buf_pos = 0;

37
hawk/lib/val.c
View File

@ -211,7 +211,7 @@ static void gc_dump_refs (hawk_rtx_t* rtx, hawk_gch_t* list)
hawk_logbfmt (hawk_rtx_gethawk(rtx), HAWK_LOG_STDERR, "[GC] GCH %p gc_refs %d\n", gch, (int)gch->gc_refs); hawk_logbfmt (hawk_rtx_gethawk(rtx), HAWK_LOG_STDERR, "[GC] GCH %p gc_refs %d\n", gch, (int)gch->gc_refs);
gch = gch->gc_next; gch = gch->gc_next;
} }
hawk_logbfmt (hawk_rtx_gethawk(rtx), HAWK_LOG_STDERR, "[GC] all_count => %d\n", (int)rtx->gc.c[0]); hawk_logbfmt (hawk_rtx_gethawk(rtx), HAWK_LOG_STDERR, "[GC] all_count => %d\n", (int)rtx->gc.nv[0]);
} }
static void gc_move_reachables (hawk_gch_t* list, hawk_gch_t* reachable_list) static void gc_move_reachables (hawk_gch_t* list, hawk_gch_t* reachable_list)
@ -299,13 +299,13 @@ static void gc_free_unreachables (hawk_rtx_t* rtx, hawk_gch_t* list)
hawk_logbfmt (hawk_rtx_gethawk(rtx), HAWK_LOG_STDERR, "[GC] FREEING UNREACHABLE GCH %p gc_refs %zu v_refs %zu\n", gch, gch->gc_refs, hawk_gch_to_val(gch)->v_refs); hawk_logbfmt (hawk_rtx_gethawk(rtx), HAWK_LOG_STDERR, "[GC] FREEING UNREACHABLE GCH %p gc_refs %zu v_refs %zu\n", gch, gch->gc_refs, hawk_gch_to_val(gch)->v_refs);
#endif #endif
/* do what hawk_rtx_freeval() would do without HAWK_RTX_FREEVAL_GC_PRESERVE */ /* do what hawk_rtx_freeval() would do without HAWK_RTX_FREEVAL_GC_PRESERVE */
rtx->gc.c[0]--; rtx->gc.nv[0]--;
gc_unchain_gch (gch); gc_unchain_gch (gch);
hawk_rtx_freemem (rtx, gch); hawk_rtx_freemem (rtx, gch);
} }
} }
static void gc_collect_garbage (hawk_rtx_t* rtx, int gen) static void gc_collect_garbage_in_generation (hawk_rtx_t* rtx, int gen)
{ {
hawk_oow_t i, newgen; hawk_oow_t i, newgen;
hawk_gch_t reachable; hawk_gch_t reachable;
@ -338,6 +338,29 @@ static void gc_collect_garbage (hawk_rtx_t* rtx, int gen)
#endif #endif
} }
#if 0
static void gc_collect_garbage (hawk_rtx_t* rtx)
{
hawk_oow_t i;
i = HAWK_COUNTOF(rtx->gc.g);
while (i > 1)
{
--i;
if (rtx->gc.nc[i - 1] > rtx->gc.t[i])
{
gc_collect_garbage_in_generation(rtx, i);
rtx->gc.nc[i]++;
if (i > 0) rtx->gc.nc[i - 1] = 0;
return;
}
}
gc_collect_garbage_in_generation(rtx, 0);
rtx->gc.nc[0]++;
}
#endif
void hawk_rtx_gc (hawk_rtx_t* rtx) void hawk_rtx_gc (hawk_rtx_t* rtx)
{ {
#if 0 #if 0
@ -365,8 +388,10 @@ void hawk_rtx_gc (hawk_rtx_t* rtx)
#if defined(DEBUG_GC) #if defined(DEBUG_GC)
hawk_logbfmt (hawk_rtx_gethawk(rtx), HAWK_LOG_STDERR, "[GC] **ended**\n"); hawk_logbfmt (hawk_rtx_gethawk(rtx), HAWK_LOG_STDERR, "[GC] **ended**\n");
#endif #endif
#else #else
gc_collect_garbage (rtx, HAWK_COUNTOF(rtx->gc.g) - 1); /* full garbage collection */ gc_collect_garbage_in_generation (rtx, HAWK_COUNTOF(rtx->gc.g) - 1); /* full garbage collection */
#endif #endif
} }
@ -933,7 +958,7 @@ hawk_rtx_gc(rtx);
#if defined(HAWK_ENABLE_GC) #if defined(HAWK_ENABLE_GC)
gc_chain_val (&rtx->gc.g[0], (hawk_val_t*)val); gc_chain_val (&rtx->gc.g[0], (hawk_val_t*)val);
rtx->gc.c[0]++; rtx->gc.nv[0]++;
val->v_gc = 1; val->v_gc = 1;
#if defined(DEBUG_GC) #if defined(DEBUG_GC)
hawk_logbfmt (hawk_rtx_gethawk(rtx), HAWK_LOG_STDERR, "[GC] MADE GCH %p VAL %p\n", hawk_val_to_gch(val), val); hawk_logbfmt (hawk_rtx_gethawk(rtx), HAWK_LOG_STDERR, "[GC] MADE GCH %p VAL %p\n", hawk_val_to_gch(val), val);
@ -1257,7 +1282,7 @@ void hawk_rtx_freeval (hawk_rtx_t* rtx, hawk_val_t* val, int flags)
hawk_map_fini (((hawk_val_map_t*)val)->map); hawk_map_fini (((hawk_val_map_t*)val)->map);
if (!(flags & HAWK_RTX_FREEVAL_GC_PRESERVE)) if (!(flags & HAWK_RTX_FREEVAL_GC_PRESERVE))
{ {
rtx->gc.c[0]--; rtx->gc.nv[0]--;
gc_unchain_val (val); gc_unchain_val (val);
hawk_rtx_freemem (rtx, hawk_val_to_gch(val)); hawk_rtx_freemem (rtx, hawk_val_to_gch(val));
} }