[src/trunk]: src ddb: rename "show lockstat" to "show lockstats" to avoid con...

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dab52eb4d093
branches:  trunk
changeset: 360615:dab52eb4d093
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Mon Mar 19 08:41:21 2018 +0000

description:
ddb: rename "show lockstat" to "show lockstats" to avoid conflicting with lockstat(8)

Requested by mrg@

diffstat:

 share/man/man4/ddb.4      |   6 +++---
 sys/ddb/db_command.c      |  14 +++++++-------
 sys/kern/subr_lockdebug.c |   6 +++---
 sys/sys/lockdebug.h       |   4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diffs (125 lines):

diff -r 289993494e16 -r dab52eb4d093 share/man/man4/ddb.4
--- a/share/man/man4/ddb.4      Mon Mar 19 03:14:08 2018 +0000
+++ b/share/man/man4/ddb.4      Mon Mar 19 08:41:21 2018 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: ddb.4,v 1.177 2018/03/16 10:42:20 wiz Exp $
+.\"    $NetBSD: ddb.4,v 1.178 2018/03/19 08:41:21 ozaki-r Exp $
 .\"
 .\" Copyright (c) 1997 - 2009 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -56,7 +56,7 @@
 .\" any improvements or extensions that they make and grant Carnegie Mellon
 .\" the rights to redistribute these changes.
 .\"
-.Dd March 16, 2018
+.Dd March 19, 2018
 .Dt DDB 4
 .Os
 .Sh NAME
@@ -657,7 +657,7 @@
 .Ar address .
 This command is only useful if a kernel is compiled with
 .Cd options LOCKDEBUG .
-.It Ic show lockstat
+.It Ic show lockstats
 Display information about lock statistics.
 This command is only useful if a kernel is compiled with
 .Cd options LOCKDEBUG .
diff -r 289993494e16 -r dab52eb4d093 sys/ddb/db_command.c
--- a/sys/ddb/db_command.c      Mon Mar 19 03:14:08 2018 +0000
+++ b/sys/ddb/db_command.c      Mon Mar 19 08:41:21 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_command.c,v 1.152 2018/03/16 04:45:20 ozaki-r Exp $ */
+/*     $NetBSD: db_command.c,v 1.153 2018/03/19 08:41:21 ozaki-r Exp $ */
 
 /*
  * Copyright (c) 1996, 1997, 1998, 1999, 2002, 2009 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.152 2018/03/16 04:45:20 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.153 2018/03/19 08:41:21 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_aio.h"
@@ -191,7 +191,7 @@
 static void     db_help_print_cmd(db_expr_t, bool, db_expr_t, const char *);
 static void    db_lock_print_cmd(db_expr_t, bool, db_expr_t, const char *);
 static void    db_show_all_locks(db_expr_t, bool, db_expr_t, const char *);
-static void    db_show_lockstat(db_expr_t, bool, db_expr_t, const char *);
+static void    db_show_lockstats(db_expr_t, bool, db_expr_t, const char *);
 static void    db_mount_print_cmd(db_expr_t, bool, db_expr_t, const char *);
 static void    db_mbuf_print_cmd(db_expr_t, bool, db_expr_t, const char *);
 static void    db_map_print_cmd(db_expr_t, bool, db_expr_t, const char *);
@@ -252,8 +252,8 @@
            "Print the files open by process at address",
            "[/f] address", NULL) },
        { DDB_ADD_CMD("lock",   db_lock_print_cmd,      0,NULL,NULL,NULL) },
-       { DDB_ADD_CMD("lockstat",
-                               db_show_lockstat,       0,
+       { DDB_ADD_CMD("lockstats",
+                               db_show_lockstats,      0,
            "Print statistics of locks", NULL, NULL) },
        { DDB_ADD_CMD("map",    db_map_print_cmd,       0,
            "Print the vm_map at address.", "[/f] address",NULL) },
@@ -1245,12 +1245,12 @@
 }
 
 static void
-db_show_lockstat(db_expr_t addr, bool have_addr,
+db_show_lockstats(db_expr_t addr, bool have_addr,
     db_expr_t count, const char *modif)
 {
 
 #ifdef _KERNEL /* XXX CRASH(8) */
-       lockdebug_show_lockstat(db_printf);
+       lockdebug_show_lockstats(db_printf);
 #endif
 }
 
diff -r 289993494e16 -r dab52eb4d093 sys/kern/subr_lockdebug.c
--- a/sys/kern/subr_lockdebug.c Mon Mar 19 03:14:08 2018 +0000
+++ b/sys/kern/subr_lockdebug.c Mon Mar 19 08:41:21 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_lockdebug.c,v 1.63 2018/03/16 08:21:45 ozaki-r Exp $      */
+/*     $NetBSD: subr_lockdebug.c,v 1.64 2018/03/19 08:41:21 ozaki-r Exp $      */
 
 /*-
  * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.63 2018/03/16 08:21:45 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.64 2018/03/19 08:41:21 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -930,7 +930,7 @@
 }
 
 void
-lockdebug_show_lockstat(void (*pr)(const char *, ...))
+lockdebug_show_lockstats(void (*pr)(const char *, ...))
 {
 #ifdef LOCKDEBUG
        lockdebug_t *ld;
diff -r 289993494e16 -r dab52eb4d093 sys/sys/lockdebug.h
--- a/sys/sys/lockdebug.h       Mon Mar 19 03:14:08 2018 +0000
+++ b/sys/sys/lockdebug.h       Mon Mar 19 08:41:21 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lockdebug.h,v 1.18 2018/03/16 04:44:51 ozaki-r Exp $   */
+/*     $NetBSD: lockdebug.h,v 1.19 2018/03/19 08:41:21 ozaki-r Exp $   */
 
 /*-
  * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
     __printflike(1, 2));
 void   lockdebug_show_all_locks(void (*)(const char *, ...) __printflike(1, 2),
            const char *);
-void   lockdebug_show_lockstat(void (*)(const char *, ...) __printflike(1, 2));
+void   lockdebug_show_lockstats(void (*)(const char *, ...) __printflike(1, 2));
 
 #ifdef LOCKDEBUG