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

gc enhancement for supporting generational processing

Browse Source
This commit is contained in:
hyung-hwan 2020-03-25 08:40:41 +00:00
parent c1ffc899fe
commit d448f8d8bc
2 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -406,8 +406,8 @@ struct hawk_rtx_t
struct struct
{ {
int collecting; int collecting;
hawk_oow_t c[HAWK_GC_NUM_GENS]; hawk_oow_t c[HAWK_GC_NUM_GENS]; /* number of values in each list */
hawk_gch_t g[HAWK_GC_NUM_GENS]; hawk_gch_t g[HAWK_GC_NUM_GENS]; /* lists of values under gc management */
} gc; } gc;
hawk_nde_blk_t* active_block; hawk_nde_blk_t* active_block;

61
hawk/lib/val.c
View File

@ -136,24 +136,6 @@ static HAWK_INLINE void gc_chain_val (hawk_gch_t* list, hawk_val_t* v)
static HAWK_INLINE void gc_move_all_gchs (hawk_gch_t* src, hawk_gch_t* dst) static HAWK_INLINE void gc_move_all_gchs (hawk_gch_t* src, hawk_gch_t* dst)
{ {
#if 0
/* move src to dst */
if (src->gc_next != src)
{
dst->gc_next = src->gc_next;
dst->gc_next->gc_prev = dst;
dst->gc_prev = src->gc_prev;
dst->gc_prev->gc_next = dst;
}
else
{
dst->gc_prev = dst;
dst->gc_next = dst;
}
src->gc_prev = src;
src->gc_next = src;
#else
/* append src to dst */ /* append src to dst */
if (src->gc_next != src) if (src->gc_next != src)
{ {
@ -167,7 +149,6 @@ static HAWK_INLINE void gc_move_all_gchs (hawk_gch_t* src, hawk_gch_t* dst)
} }
src->gc_prev = src; src->gc_prev = src;
src->gc_next = src; src->gc_next = src;
#endif
} }
static HAWK_INLINE void gc_unchain_gch (hawk_gch_t* gch) static HAWK_INLINE void gc_unchain_gch (hawk_gch_t* gch)
@ -324,8 +305,42 @@ static void gc_free_unreachables (hawk_rtx_t* rtx, hawk_gch_t* list)
} }
} }
static void gc_collect_garbage (hawk_rtx_t* rtx, int gen)
{
hawk_oow_t i, newgen;
hawk_gch_t reachable;
#if defined(DEBUG_GC)
hawk_logbfmt (hawk_rtx_gethawk(rtx), HAWK_LOG_STDERR, "[GC] **started**\n");
#endif
newgen = (gen < HAWK_COUNTOF(rtx->gc.g) - 1)? (gen + 1): gen;
for (i = 0; i < gen; i++) gc_move_all_gchs (&rtx->gc.g[i], &rtx->gc.g[gen]);
gc_trace_refs (&rtx->gc.g[gen]);
reachable.gc_prev = &reachable;
reachable.gc_next = &reachable;
gc_move_reachables (&rtx->gc.g[gen], &reachable);
/* only unreachables are left in rtx->gc.g[0] */
#if defined(DEBUG_GC)
/*gc_dump_refs (rtx, &rtx->gc.g[0]);*/
#endif
gc_free_unreachables (rtx, &rtx->gc.g[gen]);
HAWK_ASSERT (rtx->gc.g[gen].gc_next == &rtx->gc.g[gen]);
/* move all reachables back to the main list */
gc_move_all_gchs (&reachable, &rtx->gc.g[newgen]);
#if defined(DEBUG_GC)
hawk_logbfmt (hawk_rtx_gethawk(rtx), HAWK_LOG_STDERR, "[GC] **ended**\n");
#endif
}
void hawk_rtx_gc (hawk_rtx_t* rtx) void hawk_rtx_gc (hawk_rtx_t* rtx)
{ {
#if 0
hawk_gch_t reachable; hawk_gch_t reachable;
#if defined(DEBUG_GC) #if defined(DEBUG_GC)
@ -338,9 +353,10 @@ void hawk_rtx_gc (hawk_rtx_t* rtx)
gc_move_reachables (&rtx->gc.g[0], &reachable); gc_move_reachables (&rtx->gc.g[0], &reachable);
/* only unreachables are left in rtx->gc.g[0] */ /* only unreachables are left in rtx->gc.g[0] */
//gc_dump_refs (rtx, &rtx->gc.g[0]); #if defined(DEBUG_GC)
/*gc_dump_refs (rtx, &rtx->gc.g[0]);*/
#endif
gc_free_unreachables (rtx, &rtx->gc.g[0]); gc_free_unreachables (rtx, &rtx->gc.g[0]);
//gc_dump_refs (rtx, &rtx->gc.g[0]);
HAWK_ASSERT (rtx->gc.g[0].gc_next == &rtx->gc.g[0]); HAWK_ASSERT (rtx->gc.g[0].gc_next == &rtx->gc.g[0]);
/* move all reachables back to the main list */ /* move all reachables back to the main list */
@ -349,6 +365,9 @@ 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
gc_collect_garbage (rtx, HAWK_COUNTOF(rtx->gc.g) - 1); /* full garbage collection */
#endif
} }
#endif #endif