diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-10-22 21:41:42 +0000 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2023-01-09 15:22:49 -0500 |
| commit | 1cd74885c031caeb2fd4a34080b486454067cbb9 (patch) | |
| tree | 5cb9a654b30a1977bece08fbef3943cafd20ecee | |
| parent | b45c529f4e57b9e24735dcd9ae088f230ff2bb9d (diff) | |
| download | haskell-1cd74885c031caeb2fd4a34080b486454067cbb9.tar.gz | |
nonmoving: Post-sweep sanity checking
| -rw-r--r-- | rts/sm/NonMoving.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/rts/sm/NonMoving.c b/rts/sm/NonMoving.c index 32575088eb..47cd82c2a4 100644 --- a/rts/sm/NonMoving.c +++ b/rts/sm/NonMoving.c @@ -25,8 +25,11 @@ #include "NonMovingSweep.h" #include "NonMovingCensus.h" #include "StablePtr.h" // markStablePtrTable +#include "Sanity.h" #include "Weak.h" // scheduleFinalizers +#define NONCONCURRENT_SWEEP + struct NonmovingHeap nonmovingHeap; uint8_t nonmovingMarkEpoch = 1; @@ -1191,7 +1194,7 @@ static void nonmovingMark_(MarkQueue *mark_queue, StgWeak **dead_weaks, StgTSO * #endif // Everything has been marked; allow the mutators to proceed -#if defined(THREADED_RTS) +#if defined(THREADED_RTS) && !defined(NONCONCURRENT_SWEEP) nonmoving_write_barrier_enabled = false; nonmovingFinishFlush(task); #endif @@ -1230,6 +1233,15 @@ static void nonmovingMark_(MarkQueue *mark_queue, StgWeak **dead_weaks, StgTSO * nonmovingTraceAllocatorCensus(); #endif +#if defined(THREADED_RTS) && defined(NONCONCURRENT_SWEEP) +#if defined(DEBUG) + checkNonmovingHeap(&nonmovingHeap); + checkSanity(true, true); +#endif + nonmoving_write_barrier_enabled = false; + nonmovingFinishFlush(task); +#endif + // TODO: Remainder of things done by GarbageCollect (update stats) #if defined(THREADED_RTS) |