[Midnightbsd-cvs] src [11517] trunk/usr.bin/ktrdump/ktrdump.c: sync ktrdump with freebsd.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Jul 7 15:20:13 EDT 2018
Revision: 11517
http://svnweb.midnightbsd.org/src/?rev=11517
Author: laffer1
Date: 2018-07-07 15:20:13 -0400 (Sat, 07 Jul 2018)
Log Message:
-----------
sync ktrdump with freebsd.
Modified Paths:
--------------
trunk/usr.bin/ktrdump/Makefile
trunk/usr.bin/ktrdump/ktrdump.8
trunk/usr.bin/ktrdump/ktrdump.c
Property Changed:
----------------
trunk/usr.bin/ktrdump/ktrdump.8
Modified: trunk/usr.bin/ktrdump/Makefile
===================================================================
--- trunk/usr.bin/ktrdump/Makefile 2018-07-07 19:19:48 UTC (rev 11516)
+++ trunk/usr.bin/ktrdump/Makefile 2018-07-07 19:20:13 UTC (rev 11517)
@@ -1,4 +1,5 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/usr.bin/ktrdump/Makefile 201386 2010-01-02 10:27:05Z ed $
PROG= ktrdump
DPADD= ${LIBKVM}
Modified: trunk/usr.bin/ktrdump/ktrdump.8
===================================================================
--- trunk/usr.bin/ktrdump/ktrdump.8 2018-07-07 19:19:48 UTC (rev 11516)
+++ trunk/usr.bin/ktrdump/ktrdump.8 2018-07-07 19:20:13 UTC (rev 11517)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\"-
.\" Copyright (c) 2002 Chad David
.\" All rights reserved.
@@ -23,9 +24,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.bin/ktrdump/ktrdump.8 280255 2015-03-19 13:08:17Z jhb $
.\"
-.Dd March 8, 2005
+.Dd February 6, 2015
.Dt KTRDUMP 8
.Os
.Sh NAME
@@ -34,9 +35,9 @@
.Sh SYNOPSIS
.Nm
.Op Fl cfqrtH
-.Op Fl e Ar execfile
.Op Fl i Ar ktrfile
-.Op Fl m Ar corefile
+.Op Fl M Ar core
+.Op Fl N Ar system
.Op Fl o Ar outfile
.Sh DESCRIPTION
The
@@ -44,7 +45,7 @@
utility is used to dump the contents of the kernel ktr trace buffer.
.Pp
The following options are available:
-.Bl -tag -width ".Fl e Ar execfile"
+.Bl -tag -width ".Fl i Ar ktrfile"
.It Fl c
Print the CPU number that each entry was logged from.
.It Fl f
@@ -61,11 +62,11 @@
File containing saved ktr trace events; for more information see the
.Xr ktr 4
manual page.
-.It Fl e Ar execfile
+.It Fl N Ar system
The kernel image to resolve symbols from.
The default is the value returned via
.Xr getbootfile 3 .
-.It Fl m Ar corefile
+.It Fl M Ar core
The core file or memory image to read from.
The default is
.Pa /dev/mem .
Property changes on: trunk/usr.bin/ktrdump/ktrdump.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.bin/ktrdump/ktrdump.c
===================================================================
--- trunk/usr.bin/ktrdump/ktrdump.c 2018-07-07 19:19:48 UTC (rev 11516)
+++ trunk/usr.bin/ktrdump/ktrdump.c 2018-07-07 19:20:13 UTC (rev 11517)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2002 Jake Burkholder
* Copyright (c) 2004 Robert Watson
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.bin/ktrdump/ktrdump.c 280255 2015-03-19 13:08:17Z jhb $");
#include <sys/types.h>
#include <sys/ktr.h>
@@ -46,7 +47,7 @@
#define SBUFLEN 128
#define USAGE \
- "usage: ktrdump [-cfqrtH] [-e execfile] [-i ktrfile] [-m corefile] [-o outfile]\n"
+ "usage: ktrdump [-cfqrtH] [-i ktrfile] [-M core] [-N system] [-o outfile]\n"
static void usage(void);
@@ -59,9 +60,9 @@
};
static int cflag;
-static int eflag;
static int fflag;
-static int mflag;
+static int Mflag;
+static int Nflag;
static int qflag;
static int rflag;
static int tflag;
@@ -86,6 +87,7 @@
u_long parms[KTR_PARMS];
struct ktr_entry *buf;
uintmax_t tlast, tnow;
+ unsigned long bufptr;
struct stat sb;
kvm_t *kd;
FILE *out;
@@ -102,16 +104,17 @@
* Parse commandline arguments.
*/
out = stdout;
- while ((c = getopt(ac, av, "cfqrtHe:i:m:o:")) != -1)
+ while ((c = getopt(ac, av, "cfqrtHe:i:m:M:N:o:")) != -1)
switch (c) {
case 'c':
cflag = 1;
break;
+ case 'N':
case 'e':
if (strlcpy(execfile, optarg, sizeof(execfile))
>= sizeof(execfile))
errx(1, "%s: File name too long", optarg);
- eflag = 1;
+ Nflag = 1;
break;
case 'f':
fflag = 1;
@@ -121,11 +124,12 @@
if ((in = open(optarg, O_RDONLY)) == -1)
err(1, "%s", optarg);
break;
+ case 'M':
case 'm':
if (strlcpy(corefile, optarg, sizeof(corefile))
>= sizeof(corefile))
errx(1, "%s: File name too long", optarg);
- mflag = 1;
+ Mflag = 1;
break;
case 'o':
if ((out = fopen(optarg, "w")) == NULL)
@@ -156,8 +160,8 @@
* Open our execfile and corefile, resolve needed symbols and read in
* the trace buffer.
*/
- if ((kd = kvm_openfiles(eflag ? execfile : NULL,
- mflag ? corefile : NULL, NULL, O_RDONLY, errbuf)) == NULL)
+ if ((kd = kvm_openfiles(Nflag ? execfile : NULL,
+ Mflag ? corefile : NULL, NULL, O_RDONLY, errbuf)) == NULL)
errx(1, "%s", errbuf);
if (kvm_nlist(kd, nl) != 0 ||
kvm_read(kd, nl[0].n_value, &version, sizeof(version)) == -1)
@@ -179,8 +183,9 @@
if ((buf = malloc(sizeof(*buf) * entries)) == NULL)
err(1, NULL);
if (kvm_read(kd, nl[2].n_value, &index, sizeof(index)) == -1 ||
- kvm_read(kd, nl[3].n_value, buf, sizeof(*buf) * entries)
- == -1)
+ kvm_read(kd, nl[3].n_value, &bufptr,
+ sizeof(bufptr)) == -1 ||
+ kvm_read(kd, bufptr, buf, sizeof(*buf) * entries) == -1)
errx(1, "%s", kvm_geterr(kd));
}
More information about the Midnightbsd-cvs
mailing list