Back out previous.

This commit is contained in:
fvdl 2003-06-29 22:35:35 +00:00
parent d5aece61d6
commit 4fdb86c883
2 changed files with 6 additions and 15 deletions

View File

@ -1,4 +1,4 @@
.\" $NetBSD: kdump.1,v 1.17 2003/06/28 17:15:07 darrenr Exp $
.\" $NetBSD: kdump.1,v 1.18 2003/06/29 22:35:35 fvdl Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@ -41,7 +41,7 @@
.Nd display kernel trace data
.Sh SYNOPSIS
.Nm
.Op Fl dlLNnRT
.Op Fl dlNnRT
.Op Fl e Ar emulation
.Op Fl f Ar file
.Op Fl m Ar maxdata
@ -73,8 +73,6 @@ Display the specified file instead of
.It Fl l
Loop reading the trace file, once the end-of-file is reached, waiting for
more data.
.It Fl L
Show light weight process id's as well as the process id.
.It Fl m Ar maxdata
Display at most
.Ar maxdata

View File

@ -1,4 +1,4 @@
/* $NetBSD: kdump.c,v 1.50 2003/06/29 18:05:06 martin Exp $ */
/* $NetBSD: kdump.c,v 1.51 2003/06/29 22:35:35 fvdl Exp $ */
/*-
* Copyright (c) 1988, 1993
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\
#if 0
static char sccsid[] = "@(#)kdump.c 8.4 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: kdump.c,v 1.50 2003/06/29 18:05:06 martin Exp $");
__RCSID("$NetBSD: kdump.c,v 1.51 2003/06/29 22:35:35 fvdl Exp $");
#endif
#endif /* not lint */
@ -77,7 +77,6 @@ pid_t do_pid = -1;
const char *tracefile = NULL;
struct ktr_header ktr_header;
int emul_changed = 0;
int show_lwp = 0;
#define eqs(s1, s2) (strcmp((s1), (s2)) == 0)
@ -127,7 +126,7 @@ main(argc, argv)
int trpoints = ALL_POINTS;
const char *emul_name = "netbsd";
while ((ch = getopt(argc, argv, "e:f:dlLm:Nnp:RTt:")) != -1)
while ((ch = getopt(argc, argv, "e:f:dlm:Nnp:RTt:")) != -1)
switch (ch) {
case 'e':
emul_name = strdup(optarg); /* it's safer to copy it */
@ -141,9 +140,6 @@ main(argc, argv)
case 'l':
tail = 1;
break;
case 'L':
show_lwp = 1;
break;
case 'p':
do_pid = atoi(optarg);
break;
@ -306,10 +302,7 @@ dumpheader(kth)
type = unknown;
}
(void)printf("%6d", kth->ktr_pid);
if (show_lwp)
(void)printf("/%" PRIdPTR, (intptr_t)kth->ktr_buf);
(void)printf(" %-8.*s ", MAXCOMLEN, kth->ktr_comm);
(void)printf("%6d %-8.*s ", kth->ktr_pid, MAXCOMLEN, kth->ktr_comm);
if (timestamp) {
if (timestamp == 2) {
timersub(&kth->ktr_time, &prevtime, &temp);