Module Name: src
Committed By: ozaki-r
Date: Mon Mar 19 08:41:22 UTC 2018
Modified Files:
src/share/man/man4: ddb.4
src/sys/ddb: db_command.c
src/sys/kern: subr_lockdebug.c
src/sys/sys: lockdebug.h
Log Message:
ddb: rename "show lockstat" to "show lockstats" to avoid conflicting with
lockstat(8)
Requested by mrg@
To generate a diff of this commit:
cvs rdiff -u -r1.177 -r1.178 src/share/man/man4/ddb.4
cvs rdiff -u -r1.152 -r1.153 src/sys/ddb/db_command.c
cvs rdiff -u -r1.63 -r1.64 src/sys/kern/subr_lockdebug.c
cvs rdiff -u -r1.18 -r1.19 src/sys/sys/lockdebug.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/ddb.4
diff -u src/share/man/man4/ddb.4:1.177 src/share/man/man4/ddb.4:1.178
--- src/share/man/man4/ddb.4:1.177 Fri Mar 16 10:42:20 2018
+++ src/share/man/man4/ddb.4 Mon Mar 19 08:41:21 2018
@@ -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 @@ Display information about a lock at
.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 .
Index: src/sys/ddb/db_command.c
diff -u src/sys/ddb/db_command.c:1.152 src/sys/ddb/db_command.c:1.153
--- src/sys/ddb/db_command.c:1.152 Fri Mar 16 04:45:20 2018
+++ src/sys/ddb/db_command.c Mon Mar 19 08:41:21 2018
@@ -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_fncall(db_expr_t, bool, d
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 @@ static const struct db_command db_show_c
"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 @@ db_show_all_locks(db_expr_t addr, bool h
}
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
}
Index: src/sys/kern/subr_lockdebug.c
diff -u src/sys/kern/subr_lockdebug.c:1.63 src/sys/kern/subr_lockdebug.c:1.64
--- src/sys/kern/subr_lockdebug.c:1.63 Fri Mar 16 08:21:45 2018
+++ src/sys/kern/subr_lockdebug.c Mon Mar 19 08:41:21 2018
@@ -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 @@ lockdebug_show_all_locks(void (*pr)(cons
}
void
-lockdebug_show_lockstat(void (*pr)(const char *, ...))
+lockdebug_show_lockstats(void (*pr)(const char *, ...))
{
#ifdef LOCKDEBUG
lockdebug_t *ld;
Index: src/sys/sys/lockdebug.h
diff -u src/sys/sys/lockdebug.h:1.18 src/sys/sys/lockdebug.h:1.19
--- src/sys/sys/lockdebug.h:1.18 Fri Mar 16 04:44:51 2018
+++ src/sys/sys/lockdebug.h Mon Mar 19 08:41:21 2018
@@ -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 @@ void lockdebug_lock_print(void *, void (
__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
