diff options
| -rw-r--r-- | usr.bin/kdump/kdump.1 | 14 | ||||
| -rw-r--r-- | usr.bin/kdump/kdump.c | 7 | ||||
| -rw-r--r-- | usr.bin/ktrace/ktrace.1 | 8 |
3 files changed, 15 insertions, 14 deletions
diff --git a/usr.bin/kdump/kdump.1 b/usr.bin/kdump/kdump.1 index 147baf2d314..9f74e86eb5b 100644 --- a/usr.bin/kdump/kdump.1 +++ b/usr.bin/kdump/kdump.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: kdump.1,v 1.33 2018/12/12 17:55:28 tedu Exp $ +.\" $OpenBSD: kdump.1,v 1.34 2019/05/15 15:36:59 schwarze Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)kdump.1 8.1 (Berkeley) 6/6/93 .\" -.Dd $Mdocdate: December 12 2018 $ +.Dd $Mdocdate: May 15 2019 $ .Dt KDUMP 1 .Os .Sh NAME @@ -41,7 +41,7 @@ .Op Fl f Ar file .Op Fl m Ar maxdata .Op Fl p Ar pid -.Op Fl t Op Cm cinpstuxX+ +.Op Fl t Ar trstr .Sh DESCRIPTION .Nm displays the kernel trace files produced with @@ -97,13 +97,15 @@ Display relative timestamps (time since previous entry). Display absolute timestamps for each entry (seconds since the Epoch). .It Fl TR If both options are specified, display timestamps relative to trace start. -.It Fl t Op Cm cinpstuxX+ -Selects which tracepoints to display. +.It Fl t Ar trstr +Select which tracepoints to display. +The argument can contain one or more of the letters +.Cm cinpstuxX+ . See the .Fl t option of .Xr ktrace 1 -for the definitions of the flags. +for the meaning of the letters. .It Fl X Display I/O data with hexadecimal data and printable ASCII characters side by side. diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index 3d8d5a277db..be30fd305a5 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kdump.c,v 1.137 2019/01/11 18:46:30 deraadt Exp $ */ +/* $OpenBSD: kdump.c,v 1.138 2019/05/15 15:36:59 schwarze Exp $ */ /*- * Copyright (c) 1988, 1993 @@ -1390,9 +1390,8 @@ usage(void) extern char *__progname; fprintf(stderr, "usage: %s " - "[-dHlnRTXx] [-f file] [-m maxdata] [-p pid]\n" - "%*s[-t [cinpstuxX+]]\n", - __progname, (int)(sizeof("usage: ") + strlen(__progname)), ""); + "[-dHlnRTXx] [-f file] [-m maxdata] [-p pid] [-t trstr]\n", + __progname); exit(1); } diff --git a/usr.bin/ktrace/ktrace.1 b/usr.bin/ktrace/ktrace.1 index 7ecbb113394..6b6be67c359 100644 --- a/usr.bin/ktrace/ktrace.1 +++ b/usr.bin/ktrace/ktrace.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ktrace.1,v 1.29 2016/07/18 09:36:50 guenther Exp $ +.\" $OpenBSD: ktrace.1,v 1.30 2019/05/15 15:36:59 schwarze Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)ktrace.1 8.1 (Berkeley) 6/6/93 .\" -.Dd $Mdocdate: July 18 2016 $ +.Dd $Mdocdate: May 15 2019 $ .Dt KTRACE 1 .Os .Sh NAME @@ -110,11 +110,11 @@ Enable (disable) tracing on the indicated process ID (only one .Fl p flag is permitted). .It Fl t Ar trstr -The string argument represents the kernel trace points, one per letter. +Select which information to put into the dump file. +The argument can contain one or more of the following letters. By default all trace points except for .Cm X are enabled. -The following table equates the letters with the trace points: .Pp .Bl -tag -width flag -offset indent -compact .It Cm c |