XS: organic vs forced garbage collection

Author: Patrick Soquet

xs/platforms/gecko/xsHost.c

@@ -314,7 +314,7 @@ txSlot* fxAllocateSlots(txMachine* the, txSize theCount)
 	result = (txSlot *)mc_xs_slot_allocator(the, theCount * sizeof(txSlot));
 	if (!result) {
 		fxReport(the, "# Slot allocation: failed. trying to make room...\n");
-		fxCollect(the, 1);	/* expecting memory from the chunk pool */
+		fxCollect(the, XS_COMPACT_FLAG | XS_ORGANIC_FLAG);	/* expecting memory from the chunk pool */
 		if (the->firstBlock != C_NULL && the->firstBlock->limit == mc_xs_chunk_allocator(the, 0)) {	/* sanity check just in case */
 			fxReport(the, "# Slot allocation: %d bytes returned\n", the->firstBlock->limit - the->firstBlock->current);
 			the->maximumChunksSize -= the->firstBlock->limit - the->firstBlock->current;

xs/platforms/mc/xsHosts.c

@@ -147,7 +147,7 @@ txSlot *fxAllocateSlots(txMachine* the, txSize theCount)
 #ifdef mxDebug
 		fxReport(the, "# Slot allocation: failed. trying to make room...\n");
 #endif
-		fxCollect(the, 1);	/* expecting memory from the chunk pool */
+		fxCollect(the, XS_COMPACT_FLAG | XS_ORGANIC_FLAG);	/* expecting memory from the chunk pool */
 #ifdef mxDebug
 		fxReport(the, "# Slot allocation: %d bytes returned\n", the->firstBlock->limit - the->firstBlock->current);
 #endif

xs/platforms/qca4020/xsHost.c

@@ -447,7 +447,7 @@ txSlot* fxAllocateSlots(txMachine* the, txSize theCount)
 	result = (txSlot *)mc_xs_slot_allocator(the, theCount * sizeof(txSlot));
 	if (!result) {
 		fxReport(the, "# Slot allocation: failed. trying to make room...\n");
-		fxCollect(the, 1);	/* expecting memory from the chunk pool */
+		fxCollect(the, XS_COMPACT_FLAG | XS_ORGANIC_FLAG);	/* expecting memory from the chunk pool */
 		if (the->firstBlock != C_NULL && the->firstBlock->limit == mc_xs_chunk_allocator(the, 0)) {	/* sanity check just in case */
 			fxReport(the, "# Slot allocation: %d bytes returned\n", the->firstBlock->limit - the->firstBlock->current);
 			the->maximumChunksSize -= the->firstBlock->limit - the->firstBlock->current;

xs/sources/xsAPI.c

@@ -1789,7 +1789,7 @@ void fxShareMachine(txMachine* the)
 
 void fxCollectGarbage(txMachine* the)
 {
-	fxCollect(the, 1);
+	fxCollect(the, XS_COMPACT_FLAG);
 }
 
 void fxEnableGarbageCollection(txMachine* the, txBoolean enableIt)

xs/sources/xsAll.h

@@ -780,7 +780,7 @@ extern txBoolean fxIsSameValue(txMachine* the, txSlot* a, txSlot* b, txBoolean z
 extern txSize fxAddChunkSizes(txMachine* the, txSize a, txSize b);
 extern void fxCheckCStack(txMachine* the);
 extern void fxAllocate(txMachine* the, txCreation* theCreation);
-extern void fxCollect(txMachine* the, txBoolean theFlag);
+extern void fxCollect(txMachine* the, txFlag theFlag);
 mxExport txSlot* fxDuplicateSlot(txMachine* the, txSlot* theSlot);
 extern void fxFree(txMachine* the);
 extern void fxGrowKeys(txMachine* the, txID theCount);
@@ -1909,9 +1909,11 @@ enum {
 	XS_GET_ONLY = XS_DONT_DELETE_FLAG | XS_DONT_ENUM_FLAG | XS_DONT_SET_FLAG,
 
 	/* collect flags */
-	XS_COLLECTING_FLAG = 1,
-	XS_TRASHING_FLAG = 2,
-	XS_SKIPPED_COLLECT_FLAG = 4,
+	XS_COMPACT_FLAG = 1,
+	XS_ORGANIC_FLAG = 2,
+	XS_COLLECTING_FLAG = 4,
+	XS_TRASHING_FLAG = 8,
+	XS_SKIPPED_COLLECT_FLAG = 16,
 	XS_HOST_CHUNK_FLAG = 32,
 	XS_HOST_HOOKS_FLAG = 64,
 

xs/sources/xsMemory.c

@@ -263,7 +263,7 @@ void fxCheckCStack(txMachine* the)
 	}
 }
 
-void fxCollect(txMachine* the, txBoolean theFlag)
+void fxCollect(txMachine* the, txFlag theFlag)
 {
 	txSize aCount;
 	txSlot* freeSlot;
@@ -275,8 +275,9 @@ void fxCollect(txMachine* the, txBoolean theFlag)
 		the->collectFlag |= XS_SKIPPED_COLLECT_FLAG;
 		return;
 	}
+	the->collectFlag |= theFlag & XS_ORGANIC_FLAG;
 
-	if (theFlag) {
+	if (theFlag & XS_COMPACT_FLAG) {
 		fxMark(the, fxMarkValue);
 		fxMarkWeakStuff(the);
 		fxSweep(the);
@@ -347,6 +348,7 @@ void fxCollect(txMachine* the, txBoolean theFlag)
 			else
 				the->collectFlag &= ~XS_TRASHING_FLAG;
 	}
+	the->collectFlag &= ~XS_ORGANIC_FLAG;
 
 #if mxReport
 	if (theFlag)
@@ -391,7 +393,7 @@ void* fxFindChunk(txMachine* the, txSize size, txBoolean *once)
 #if mxStress
 	if (fxShouldStress()) {
 		if (*once) {
-			fxCollect(the, 1);
+			fxCollect(the, XS_COMPACT_FLAG | XS_ORGANIC_FLAG);
 			*once = 0;
 		}
 	}
@@ -415,7 +417,7 @@ void* fxFindChunk(txMachine* the, txSize size, txBoolean *once)
 		block = block->nextBlock;
 	}
 	if (*once) {
-		fxCollect(the, 1);
+		fxCollect(the, XS_COMPACT_FLAG | XS_ORGANIC_FLAG);
 		*once = 0;
 		goto again;
 	}
@@ -1008,9 +1010,20 @@ void fxMarkReference(txMachine* the, txSlot* theSlot)
 		}
 		break;
 	case XS_WEAK_REF_KIND:
-		if (theSlot->value.weakRef.target) {
+		aSlot = theSlot->value.weakRef.target;
+		if (aSlot) {
+	#ifdef mxSnapshot
+			if (the->collectFlag & XS_ORGANIC_FLAG) {
+				fxMarkReference(the, aSlot);
+			}
+			else {
+				theSlot->value.weakRef.link = the->firstWeakRefLink;
+				the->firstWeakRefLink = theSlot;
+			}
+	#else
 			theSlot->value.weakRef.link = the->firstWeakRefLink;
 			the->firstWeakRefLink = theSlot;
+	#endif
 		}
 		break;
 	case XS_FINALIZATION_REGISTRY_KIND:
@@ -1250,9 +1263,20 @@ void fxMarkValue(txMachine* the, txSlot* theSlot)
 		}
 		break;
 	case XS_WEAK_REF_KIND:
-		if (theSlot->value.weakRef.target) {
+		aSlot = theSlot->value.weakRef.target;
+		if (aSlot) {
+	#ifdef mxSnapshot
+			if (the->collectFlag & XS_ORGANIC_FLAG) {
+				fxMarkValue(the, aSlot);
+			}
+			else {
+				theSlot->value.weakRef.link = the->firstWeakRefLink;
+				the->firstWeakRefLink = theSlot;
+			}
+	#else
 			theSlot->value.weakRef.link = the->firstWeakRefLink;
 			the->firstWeakRefLink = theSlot;
+	#endif
 		}
 		break;
 	case XS_FINALIZATION_REGISTRY_KIND:
@@ -1406,7 +1430,7 @@ txSlot* fxNewSlot(txMachine* the)
 
 #if mxStress
 	if (fxShouldStress()) {
-		fxCollect(the, 1);
+		fxCollect(the, XS_COMPACT_FLAG | XS_ORGANIC_FLAG);
 		once = 0;
 	}
 #endif
@@ -1435,7 +1459,7 @@ txSlot* fxNewSlot(txMachine* the)
 	if (once) {
 		txBoolean wasThrashing = ((the->collectFlag & XS_TRASHING_FLAG) != 0), isThrashing;
 
-		fxCollect(the, 0);
+		fxCollect(the, XS_ORGANIC_FLAG);
 
 		isThrashing = ((the->collectFlag & XS_TRASHING_FLAG) != 0);
 		allocate = wasThrashing && isThrashing;