diff options
author | Ben Gamari <ben@smart-cactus.org> | 2023-01-21 16:19:09 -0500 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2023-03-08 15:02:31 -0500 |
commit | 56e669c11208bba136c44ee7154b59e0d4d39c87 (patch) | |
tree | 74cb23caf58784ae1d0c207639075279b67022f7 /rts | |
parent | b500867a9eae6381e5c686aaa71ae069398eacb9 (diff) | |
download | haskell-56e669c11208bba136c44ee7154b59e0d4d39c87.tar.gz |
nonmoving: Fix Note references
Some references to Note [Deadlock detection under the non-moving
collector] were missing an article.
Diffstat (limited to 'rts')
-rw-r--r-- | rts/Schedule.c | 2 | ||||
-rw-r--r-- | rts/sm/Evac.c | 4 | ||||
-rw-r--r-- | rts/sm/GC.c | 2 | ||||
-rw-r--r-- | rts/sm/GC.h | 2 | ||||
-rw-r--r-- | rts/sm/NonMoving.c | 2 | ||||
-rw-r--r-- | rts/sm/NonMovingMark.c | 2 | ||||
-rw-r--r-- | rts/sm/Scav.c | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/rts/Schedule.c b/rts/Schedule.c index 5b5e765231..93c155515f 100644 --- a/rts/Schedule.c +++ b/rts/Schedule.c @@ -1579,7 +1579,7 @@ void releaseAllCapabilities(uint32_t n, Capability *keep_cap, Task *task) * Perform a garbage collection if necessary * -------------------------------------------------------------------------- */ -// N.B. See Note [Deadlock detection under nonmoving collector] for rationale +// N.B. See Note [Deadlock detection under the nonmoving collector] for rationale // behind deadlock_detect argument. static void scheduleDoGC (Capability **pcap, Task *task USED_IF_THREADS, diff --git a/rts/sm/Evac.c b/rts/sm/Evac.c index 5a523a7d81..8d2c5119fd 100644 --- a/rts/sm/Evac.c +++ b/rts/sm/Evac.c @@ -125,7 +125,7 @@ alloc_in_moving_heap (uint32_t size, uint32_t gen_no) static StgPtr alloc_for_copy_nonmoving (uint32_t size, uint32_t gen_no) { - /* See Note [Deadlock detection under nonmoving collector]. */ + /* See Note [Deadlock detection under the nonmoving collector]. */ if (deadlock_detect_gc) { return alloc_in_nonmoving_heap(size); } @@ -427,7 +427,7 @@ evacuate_large(StgPtr p) new_gen_no = bd->dest_no; if (RTS_UNLIKELY(deadlock_detect_gc)) { - /* See Note [Deadlock detection under nonmoving collector]. */ + /* See Note [Deadlock detection under the nonmoving collector]. */ new_gen_no = oldest_gen->no; } else if (new_gen_no < gct->evac_gen_no) { if (gct->eager_promotion) { diff --git a/rts/sm/GC.c b/rts/sm/GC.c index 2438ad2816..43564808c9 100644 --- a/rts/sm/GC.c +++ b/rts/sm/GC.c @@ -352,7 +352,7 @@ GarbageCollect (uint32_t collect_gen, N = collect_gen; major_gc = (N == RtsFlags.GcFlags.generations-1); - /* See Note [Deadlock detection under nonmoving collector]. */ + /* See Note [Deadlock detection under the nonmoving collector]. */ deadlock_detect_gc = deadlock_detect; #if defined(THREADED_RTS) diff --git a/rts/sm/GC.h b/rts/sm/GC.h index 25de588534..4132160c91 100644 --- a/rts/sm/GC.h +++ b/rts/sm/GC.h @@ -34,7 +34,7 @@ bool doIdleGCWork(Capability *cap, bool all); extern uint32_t N; extern bool major_gc; -/* See Note [Deadlock detection under nonmoving collector]. */ +/* See Note [Deadlock detection under the nonmoving collector]. */ extern bool deadlock_detect_gc; extern bool unload_mark_needed; diff --git a/rts/sm/NonMoving.c b/rts/sm/NonMoving.c index 798e09545c..046f2fa88c 100644 --- a/rts/sm/NonMoving.c +++ b/rts/sm/NonMoving.c @@ -346,7 +346,7 @@ Mutex concurrent_coll_finished_lock; * Marking evacuated objects] in Evac.c. * * - * Note [Deadlock detection under the non-moving collector] + * Note [Deadlock detection under the nonmoving collector] * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * In GHC the garbage collector is responsible for identifying deadlocked * programs. Providing for this responsibility is slightly tricky in the diff --git a/rts/sm/NonMovingMark.c b/rts/sm/NonMovingMark.c index 3ec1baee20..3bfff4a014 100644 --- a/rts/sm/NonMovingMark.c +++ b/rts/sm/NonMovingMark.c @@ -482,7 +482,7 @@ markQueuePushClosureGC (MarkQueue *q, StgClosure *p) } /* We should not make it here if we are doing a deadlock detect GC. - * See Note [Deadlock detection under nonmoving collector]. + * See Note [Deadlock detection under the nonmoving collector]. * This is actually no longer true due to call in nonmovingScavengeOne * introduced due to Note [Dirty flags in the non-moving collector] * (see NonMoving.c). diff --git a/rts/sm/Scav.c b/rts/sm/Scav.c index be30e75b8f..8debec6a66 100644 --- a/rts/sm/Scav.c +++ b/rts/sm/Scav.c @@ -458,7 +458,7 @@ scavenge_block (bdescr *bd) p = bd->u.scan; - // Sanity check: See Note [Deadlock detection under nonmoving collector]. + // Sanity check: See Note [Deadlock detection under the nonmoving collector]. #if defined(DEBUG) if (RtsFlags.GcFlags.useNonmoving && deadlock_detect_gc) { ASSERT(bd->gen == oldest_gen); |