From d448f8d8bc94aebb8049ddec761c84cc2a521d80 Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Wed, 25 Mar 2020 08:40:41 +0000
Subject: [PATCH] gc enhancement for supporting generational processing

---
 hawk/lib/hawk-prv.h |  4 +--
 hawk/lib/val.c      | 61 +++++++++++++++++++++++++++++----------------
 2 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/hawk/lib/hawk-prv.h b/hawk/lib/hawk-prv.h
index 6fa89ea6..cb94675c 100644
--- a/hawk/lib/hawk-prv.h
+++ b/hawk/lib/hawk-prv.h
@@ -406,8 +406,8 @@ struct hawk_rtx_t
 	struct
 	{
 		int collecting;
-		hawk_oow_t c[HAWK_GC_NUM_GENS];
-		hawk_gch_t g[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]; /* lists of values under gc management */
 	} gc;
 
 	hawk_nde_blk_t* active_block;
diff --git a/hawk/lib/val.c b/hawk/lib/val.c
index e48ec4f3..79abb91a 100644
--- a/hawk/lib/val.c
+++ b/hawk/lib/val.c
@@ -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)
 {
-#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 */
 	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_next = src;
-#endif
 }
 
 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)
 {
+#if 0
 	hawk_gch_t reachable;
 
 #if defined(DEBUG_GC)
@@ -338,9 +353,10 @@ void hawk_rtx_gc (hawk_rtx_t* rtx)
 	gc_move_reachables (&rtx->gc.g[0], &reachable);
 
 	/* 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_dump_refs (rtx, &rtx->gc.g[0]);
 	HAWK_ASSERT (rtx->gc.g[0].gc_next == &rtx->gc.g[0]); 
 
 	/* move all reachables back to the main list */
@@ -349,6 +365,9 @@ void hawk_rtx_gc (hawk_rtx_t* rtx)
 #if defined(DEBUG_GC)
 	hawk_logbfmt (hawk_rtx_gethawk(rtx), HAWK_LOG_STDERR,  "[GC] **ended**\n");
 #endif
+#else
+	gc_collect_garbage (rtx, HAWK_COUNTOF(rtx->gc.g) - 1); /* full garbage collection */
+#endif
 }
 
 #endif