Module Name: src
Committed By: ad
Date: Wed Oct 4 20:39:35 UTC 2023
Modified Files:
src/sys/kern: kern_rwlock.c kern_turnstile.c
Log Message:
Turnstiles: use the syncobj name for ps/top wmesg when sleeping since it's
more informative than "tstile".
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/kern/kern_rwlock.c
cvs rdiff -u -r1.51 -r1.52 src/sys/kern/kern_turnstile.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_rwlock.c
diff -u src/sys/kern/kern_rwlock.c:1.73 src/sys/kern/kern_rwlock.c:1.74
--- src/sys/kern/kern_rwlock.c:1.73 Sat Sep 23 18:48:04 2023
+++ src/sys/kern/kern_rwlock.c Wed Oct 4 20:39:35 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rwlock.c,v 1.73 2023/09/23 18:48:04 ad Exp $ */
+/* $NetBSD: kern_rwlock.c,v 1.74 2023/10/04 20:39:35 ad Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008, 2009, 2019, 2020, 2023
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.73 2023/09/23 18:48:04 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.74 2023/10/04 20:39:35 ad Exp $");
#include "opt_lockdebug.h"
@@ -125,7 +125,7 @@ lockops_t rwlock_lockops = {
* direct handoff. XXX To be revisited.
*/
syncobj_t rw_syncobj = {
- .sobj_name = "rw",
+ .sobj_name = "rwlock",
.sobj_flag = SOBJ_SLEEPQ_SORTED,
.sobj_boostpri = PRI_KTHREAD,
.sobj_unsleep = turnstile_unsleep,
Index: src/sys/kern/kern_turnstile.c
diff -u src/sys/kern/kern_turnstile.c:1.51 src/sys/kern/kern_turnstile.c:1.52
--- src/sys/kern/kern_turnstile.c:1.51 Wed Oct 4 20:29:18 2023
+++ src/sys/kern/kern_turnstile.c Wed Oct 4 20:39:35 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_turnstile.c,v 1.51 2023/10/04 20:29:18 ad Exp $ */
+/* $NetBSD: kern_turnstile.c,v 1.52 2023/10/04 20:39:35 ad Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2009, 2019, 2020, 2023
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_turnstile.c,v 1.51 2023/10/04 20:29:18 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_turnstile.c,v 1.52 2023/10/04 20:39:35 ad Exp $");
#include <sys/param.h>
#include <sys/lockdebug.h>
@@ -417,7 +417,7 @@ turnstile_block(turnstile_t *ts, int q,
ts->ts_waiters[q]++;
nlocks = sleepq_enter(sq, l, lock);
LOCKDEBUG_BARRIER(lock, 1);
- sleepq_enqueue(sq, obj, "tstile", sobj, false);
+ sleepq_enqueue(sq, obj, sobj->sobj_name, sobj, false);
/*
* Disable preemption across this entire block, as we may drop
