summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2023-01-21 16:19:09 -0500
committerZubin Duggal <zubin.duggal@gmail.com>2023-04-14 13:07:40 +0530
commit890d0df61e0c6d86d53f4770e2f138fb386aac2e (patch)
tree221594a70c221d3c70cab05c800860902ea3d26e
parent4fd491c1b92ff74e1359e1657ff9b45ad7379ab8 (diff)
downloadhaskell-890d0df61e0c6d86d53f4770e2f138fb386aac2e.tar.gz
nonmoving: Fix Note references
Some references to Note [Deadlock detection under the non-moving collector] were missing an article. (cherry picked from commit 43fda6487f729f8c627dbb2abbfc027444d54e52)
-rw-r--r--rts/Schedule.c2
-rw-r--r--rts/sm/Evac.c4
-rw-r--r--rts/sm/GC.c2
-rw-r--r--rts/sm/GC.h2
-rw-r--r--rts/sm/NonMoving.c2
-rw-r--r--rts/sm/NonMovingMark.c2
-rw-r--r--rts/sm/Scav.c2
7 files changed, 8 insertions, 8 deletions
diff --git a/rts/Schedule.c b/rts/Schedule.c
index 92c0091d3d..13dd004995 100644
--- a/rts/Schedule.c
+++ b/rts/Schedule.c
@@ -1562,7 +1562,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 5655dad9be..f4696973b0 100644
--- a/rts/sm/Evac.c
+++ b/rts/sm/Evac.c
@@ -122,7 +122,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);
}
@@ -424,7 +424,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 044e5f1e50..921185f6a1 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 b11ef6da16..3616e56997 100644
--- a/rts/sm/NonMoving.c
+++ b/rts/sm/NonMoving.c
@@ -347,7 +347,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 d7fb1af8a8..8e6bf27114 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 69ccea7bc3..6f114b184d 100644
--- a/rts/sm/Scav.c
+++ b/rts/sm/Scav.c
@@ -441,7 +441,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);