FEAT: allow to pass handle objects to external handle's free function and dispose handle objects before freeing any series

Author: Oldes

.version

@@ -1 +1 @@
-3.12.1
+3.12.2

make/rebol3.nest

@@ -18,7 +18,7 @@ temp:     %make/tmp/
 stack-size: 4194304 ;= 4MB (4 * 1024 * 1024)
 optimize:   2
 
-version: 3.12.1
+version: 3.12.2
 
 #if Linux?   [ defines: TO_LINUX   ]
 #if macOS?   [ defines: TO_MACOS   ]

src/core/m-gc.c

@@ -814,6 +814,8 @@ static void Mark_Series(REBSER *series, REBCNT depth);
 {
 	REBCNT n;
 	GC_Disabled = 0;
+	// Dispose context handles first, because they may depend on other series!
+	Dispose_Hobs();
 	/* remove everything from GC_Infants (GC protection) */
 	for (n = 0; n < MAX_SAFE_SERIES; n++) {
 		GC_Infants[n] = NULL;

src/core/m-pools.c

@@ -616,10 +616,11 @@ const REBPOOLSPEC Mem_Pool_Spec[MAX_POOLS] =
 	if( !IS_USED_HOB(hob) || hob->data == NULL ) return;
 
 	spec = PG_Handles[idx];
-	//printf("HOB free mem: %p\n", hob->data);
+	//printf("HOB %p free mem: %p\n", hob, hob->data);
 
-	if (spec.free)
-		spec.free(hob->data);
+	if (spec.free) {
+		spec.free(GET_FLAG(spec.flags, HANDLE_REQUIRES_HOB_ON_FREE) ? hob : hob->data);
+	}
 
 	CLEAR(hob->data, spec.size); 
 	FREE_MEM(hob->data);
@@ -1008,19 +1009,17 @@ const REBPOOLSPEC Mem_Pool_Spec[MAX_POOLS] =
 
 /***********************************************************************
 **
-*/	void Dispose_Pools(void)
+*/	void Dispose_Hobs(void)
 /*
-**		Free memory pool array when application quits.
+**		Free all HOB pool segments
 **
 ***********************************************************************/
 {
 	REBSEG	*seg, *next;
 	REBHOB *hob;
 	REBCNT  n;
 
-	//Dump_Pools();
-	//Dump_Series_In_Pool(-1);
-	
+	//puts("===== Dispose_Hobs ======");
 	// HOB at this moment does not use system series, so handle it separately
 	for (seg = Mem_Pools[HOB_POOL].segs; seg; seg = seg->next) {
 		hob = (REBHOB *) (seg + 1);
@@ -1031,8 +1030,25 @@ const REBPOOLSPEC Mem_Pool_Spec[MAX_POOLS] =
 			SKIP_WALL_TYPE(hob, REBHOB);
 		}
 	}
+}
+
+/***********************************************************************
+**
+*/	void Dispose_Pools(void)
+/*
+**		Free memory pool array when application quits.
+**
+***********************************************************************/
+{
+	REBSEG	*seg, *next;
+	REBHOB *hob;
+	REBCNT  n;
+
+	//Dump_Pools();
+	//Dump_Series_In_Pool(-1);
+	//puts("===== Dispose_Pools ======");
 
-	// than release all series from all system pools
+	// Release all series from all system pools
 	FOREACH(n, SYSTEM_POOL) {
 		//printf(cs_cast("*** Dispose_Pools[%u] Has: %u free: %u\n"), n, Mem_Pools[n].has, Mem_Pools[n].free);
 		if (Mem_Pools[n].has == Mem_Pools[n].free) {

src/include/sys-value.h

@@ -1091,9 +1091,13 @@ enum Handle_Flags {
 	HANDLE_CONTEXT_LOCKED = 1 << 5,  // so Rebol will not GC the handle if C side still depends on it
 };
 
+enum Handle_Spec_Flags {
+	HANDLE_REQUIRES_HOB_ON_FREE = 1 << 0
+}
+
 typedef struct Reb_Handle_Spec {
 	REBCNT size;
-	REBFLG flags; // reserved for future
+	REBFLG flags;
 	REB_HANDLE_FREE_FUNC free;
 	REB_HANDLE_EVAL_PATH get_path;
 	REB_HANDLE_EVAL_PATH set_path;