add bytesInScope stats for lgc,cgc

basis-library/mpl/gc.sig

@@ -46,6 +46,8 @@ sig
   val localBytesReclaimed: unit -> IntInf.int
   val localBytesReclaimedOfProc: int -> IntInf.int
 
+  val bytesInScopeForLocal: unit -> IntInf.int
+
   val numLocalGCs: unit -> IntInf.int
   val numLocalGCsOfProc: int -> IntInf.int
 
@@ -61,6 +63,8 @@ sig
   val ccBytesReclaimed: unit -> IntInf.int
   val ccBytesReclaimedOfProc: int -> IntInf.int
 
+  val bytesInScopeForCC: unit -> IntInf.int
+
   val ccTime: unit -> Time.time
   val ccTimeOfProc: int -> Time.time
 

basis-library/mpl/gc.sml

@@ -31,6 +31,12 @@ struct
     fun getCCBytesReclaimedOfProc p =
       GC.getCCBytesReclaimedOfProc (gcState (), Word32.fromInt p)
 
+    fun bytesInScopeForLocal () =
+      C_UIntmax.toLargeInt (GC.bytesInScopeForLocal (gcState ()))
+
+    fun bytesInScopeForCC () =
+      C_UIntmax.toLargeInt (GC.bytesInScopeForCC (gcState ()))
+
     fun numberDisentanglementChecks () =
       C_UIntmax.toLargeInt (GC.numberDisentanglementChecks (gcState ()))
 

basis-library/primitive/prim-mlton.sml

@@ -159,6 +159,14 @@ structure GC =
       val getCumulativeStatisticsLocalBytesReclaimedOfProc = _import
       "GC_getCumulativeStatisticsLocalBytesReclaimedOfProc" runtime private: GCState.t * Word32.word -> C_UIntmax.t;
 
+      val bytesInScopeForLocal =
+        _import "GC_bytesInScopeForLocal" runtime private:
+        GCState.t -> C_UIntmax.t;
+
+      val bytesInScopeForCC =
+        _import "GC_bytesInScopeForCC" runtime private:
+        GCState.t -> C_UIntmax.t;
+
       val getNumCCsOfProc = _import "GC_getNumCCsOfProc" runtime private: GCState.t * Word32.word -> C_UIntmax.t;
       val getCCMillisecondsOfProc = _import "GC_getCCMillisecondsOfProc" runtime private: GCState.t * Word32.word -> C_UIntmax.t;
       val getCCBytesReclaimedOfProc = _import "GC_getCCBytesReclaimedOfProc" runtime private: GCState.t * Word32.word -> C_UIntmax.t;

runtime/gc/concurrent-collection.c

@@ -1192,6 +1192,7 @@ size_t CC_collectWithRoots(
   s->cumulativeStatistics->numCCs++;
   assert(bytesScanned >= bytesSaved);
   uintmax_t bytesReclaimed = bytesScanned-bytesSaved;
+  s->cumulativeStatistics->bytesInScopeForCC += bytesScanned;
   s->cumulativeStatistics->bytesReclaimedByCC += bytesReclaimed;
 
   return lists.bytesSaved;

runtime/gc/gc_state.c

@@ -98,6 +98,22 @@ uintmax_t GC_getCumulativeStatisticsLocalBytesReclaimedOfProc(GC_state s, uint32
   return s->procStates[proc].cumulativeStatistics->bytesReclaimedByLocal;
 }
 
+uintmax_t GC_bytesInScopeForLocal(GC_state s) {
+  uintmax_t retVal = 0;
+  for (size_t i = 0; i < s->numberOfProcs; i++) {
+    retVal += s->procStates[i].cumulativeStatistics->bytesInScopeForLocal;
+  }
+  return retVal;
+}
+
+uintmax_t GC_bytesInScopeForCC(GC_state s) {
+  uintmax_t retVal = 0;
+  for (size_t i = 0; i < s->numberOfProcs; i++) {
+    retVal += s->procStates[i].cumulativeStatistics->bytesInScopeForCC;
+  }
+  return retVal;
+}
+
 uintmax_t GC_getCumulativeStatisticsBytesAllocated (GC_state s) {
   /* return sum across all processors */
   size_t retVal = 0;

runtime/gc/gc_state.h

@@ -136,6 +136,8 @@ PRIVATE uintmax_t GC_getCumulativeStatisticsNumLocalGCsOfProc(GC_state s, uint32
 PRIVATE uintmax_t GC_getNumCCsOfProc(GC_state s, uint32_t proc);
 PRIVATE uintmax_t GC_getCCMillisecondsOfProc(GC_state s, uint32_t proc);
 PRIVATE uintmax_t GC_getCCBytesReclaimedOfProc(GC_state s, uint32_t proc);
+PRIVATE uintmax_t GC_bytesInScopeForLocal(GC_state s);
+PRIVATE uintmax_t GC_bytesInScopeForCC(GC_state s);
 PRIVATE uintmax_t GC_numDisentanglementChecks(GC_state s);
 PRIVATE uintmax_t GC_numEntanglements(GC_state s);
 PRIVATE float GC_approxRaceFactor(GC_state s);

runtime/gc/hierarchical-heap-collection.c

@@ -957,6 +957,8 @@ void HM_HHC_collectLocal(uint32_t desiredScope)
     }
   }
 
+  s->cumulativeStatistics->bytesInScopeForLocal += totalSizeBefore;
+
   if (totalSizeAfter > totalSizeBefore)
   {
     // whoops?

runtime/gc/statistics.c

@@ -48,6 +48,8 @@ struct GC_cumulativeStatistics *newCumulativeStatistics(void) {
   cumulativeStatistics->bytesHHLocaled = 0;
   cumulativeStatistics->bytesReclaimedByLocal = 0;
   cumulativeStatistics->bytesReclaimedByCC = 0;
+  cumulativeStatistics->bytesInScopeForLocal = 0;
+  cumulativeStatistics->bytesInScopeForCC = 0;
   cumulativeStatistics->maxBytesLive = 0;
   cumulativeStatistics->maxBytesLiveSinceReset = 0;
   cumulativeStatistics->maxHeapSize = 0;

runtime/gc/statistics.h

@@ -37,6 +37,8 @@ struct GC_cumulativeStatistics {
   uintmax_t bytesHHLocaled;
   uintmax_t bytesReclaimedByLocal;
   uintmax_t bytesReclaimedByCC;
+  uintmax_t bytesInScopeForLocal;
+  uintmax_t bytesInScopeForCC;
 
   size_t maxBytesLive;
   size_t maxBytesLiveSinceReset;