Catch up to SMTX -> SLOCK changes.

4 files changed, 22 insertions, 25 deletions

diff --git a/bin/ps/extern.h b/bin/ps/extern.h
index 4c55025..c113462 100644
--- a/bin/ps/extern.h
+++ b/bin/ps/extern.h
@@ -59,7 +59,7 @@ void	 logname(KINFO *, VARENT *);
 void	 longtname(KINFO *, VARENT *);
 void	 lstarted(KINFO *, VARENT *);
 void	 maxrss(KINFO *, VARENT *);
-void	 mtxname(KINFO *, VARENT *);
+void	 lockname(KINFO *, VARENT *);
 void	 mwchan(KINFO *, VARENT *);
 void	 pagein(KINFO *, VARENT *);
 void	 parsefmt(const char *);
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index 1ab9253..b0a1917 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -110,7 +110,7 @@ static VAR var[] = {
 		LONG, "ld", 0},
 	{"msgsnd", "MSGSND", NULL, USER, rvar, NULL, 4, ROFF(ru_msgsnd),
 		LONG, "ld", 0},
-	{"mtxname", "MUTEX", NULL, LJUST, mtxname, NULL, 6, 0, CHAR, NULL,
+	{"lockname", "LOCK", NULL, LJUST, lockname, NULL, 6, 0, CHAR, NULL,
 		0},
 	{"mwchan", "MWCHAN", NULL, LJUST, mwchan, NULL, 6, 0, CHAR, NULL, 0},
 	{"ni", "", "nice", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
diff --git a/bin/ps/print.c b/bin/ps/print.c
index d0c43ee..3fd367a 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -227,8 +227,8 @@ state(KINFO *k, VARENT *ve)
 		*cp = 'W';
 		break;
 
-	case SMTX:
-		*cp = 'M';
+	case SLOCK:
+		*cp = 'L';
 		break;
 
 	case SZOMB:
@@ -420,15 +420,15 @@ lstarted(KINFO *k, VARENT *ve)
 }
 
 void
-mtxname(KINFO *k, VARENT *ve)
+lockname(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 
 	v = ve->var;
-	if (k->ki_p->ki_kiflag & KI_MTXBLOCK) {
-		if (k->ki_p->ki_mtxname[0] != 0)
+	if (k->ki_p->ki_kiflag & KI_LOCKBLOCK) {
+		if (k->ki_p->ki_lockname[0] != 0)
 			(void)printf("%-*.*s", v->width, v->width,
-				      k->ki_p->ki_mtxname);
+				      k->ki_p->ki_lockname);
 		else
 			(void)printf("%-*s", v->width, "???");
 	} else
@@ -466,10 +466,10 @@ mwchan(KINFO *k, VARENT *ve)
 		else
 			(void)printf("%-*lx", v->width,
 			    (long)k->ki_p->ki_wchan);
-	} else if (k->ki_p->ki_kiflag & KI_MTXBLOCK) {
-		if (k->ki_p->ki_mtxname[0]) {
+	} else if (k->ki_p->ki_kiflag & KI_LOCKBLOCK) {
+		if (k->ki_p->ki_lockname[0]) {
 			(void)printf("%-*.*s", v->width, v->width,
-			    k->ki_p->ki_mtxname);
+			    k->ki_p->ki_lockname);
 		} else {
 			(void)printf("%-*s", v->width, "???");
 		}
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 3f290e6..be4960c 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -191,7 +191,7 @@ will display information.
 .Pp
 A complete list of the available keywords are listed below.
 Some of these keywords are further specified as follows:
-.Bl -tag -width mtxname
+.Bl -tag -width lockname
 .It %cpu
 The cpu utilization of the process; this is a decaying average over up to
 a minute of previous (real) time.
@@ -232,17 +232,15 @@ The exact time the command started, using the ``%c'' format described in
 .Xr strftime 3 .
 .It lvl
 The LOMAC level of the process.
-.It mtxname
-The name of the
-.Xr mutex 9
-that the process is currently blocked on.
+.It lockname
+The name of the lock that the process is currently blocked on.
 If the name is invalid or unknown, then
 .Dq ???\&
 is displayed.
 .It mwchan
-The event name if the process is blocked normally, or the mutex name if
-the process is blocked on a mutex.
-See the wchan and mtxname keywords
+The event name if the process is blocked normally, or the lock name if
+the process is blocked on a lock.
+See the wchan and lockname keywords
 for details.
 .It nice
 The process scheduling increment (see
@@ -272,8 +270,8 @@ Marks a process which is in
 .Xr jail 2 .
 The hostname of the prison can be found in
 .Ql Li /proc/<pid>/status .
-.It M
-Marks a process that is waiting to acquire a mutex.
+.It L
+Marks a process that is waiting to acquire a lock.
 .It R
 Marks a runnable process.
 .It S
@@ -408,11 +406,10 @@ total page reclaims
 total messages received (reads from pipes/sockets)
 .It msgsnd
 total messages sent (writes on pipes/sockets)
-.It mtxname
-.Xr mutex 9
-currently blocked on (as a symbolic name)
+.It lockname
+lock currently blocked on (as a symbolic name)
 .It mwchan
-wait channel or mutex currently blocked on
+wait channel or lock currently blocked on
 .It nice
 nice value (alias ni)
 .It nivcsw