Module Name: src
Committed By: tls
Date: Sun Aug 10 06:59:37 UTC 2014
Modified Files:
src/usr.sbin/iostat [tls-earlyentropy]: Makefile iostat.8 iostat.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.22.1 src/usr.sbin/iostat/Makefile
cvs rdiff -u -r1.22 -r1.22.72.1 src/usr.sbin/iostat/iostat.8
cvs rdiff -u -r1.60 -r1.60.18.1 src/usr.sbin/iostat/iostat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/iostat/Makefile
diff -u src/usr.sbin/iostat/Makefile:1.24 src/usr.sbin/iostat/Makefile:1.24.22.1
--- src/usr.sbin/iostat/Makefile:1.24 Fri Jan 7 03:12:27 2011
+++ src/usr.sbin/iostat/Makefile Sun Aug 10 06:59:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2011/01/07 03:12:27 jakllsch Exp $
+# $NetBSD: Makefile,v 1.24.22.1 2014/08/10 06:59:37 tls Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
@@ -13,7 +13,7 @@ CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/vmst
# drvstats.c pulled in from ../../usr.bin/vmstat
SRCS= drvstats.c iostat.c
-DPADD= ${LIBKVM} ${LIBM}
-LDADD= -lkvm -lm
+DPADD= ${LIBM}
+LDADD= -lm
.include <bsd.prog.mk>
Index: src/usr.sbin/iostat/iostat.8
diff -u src/usr.sbin/iostat/iostat.8:1.22 src/usr.sbin/iostat/iostat.8:1.22.72.1
--- src/usr.sbin/iostat/iostat.8:1.22 Thu Aug 7 11:25:22 2003
+++ src/usr.sbin/iostat/iostat.8 Sun Aug 10 06:59:37 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: iostat.8,v 1.22 2003/08/07 11:25:22 agc Exp $
+.\" $NetBSD: iostat.8,v 1.22.72.1 2014/08/10 06:59:37 tls Exp $
.\"
.\" Copyright (c) 1985, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" from: @(#)iostat.8 8.1 (Berkeley) 6/6/93
.\"
-.Dd March 1, 2003
+.Dd June 11, 2014
.Dt IOSTAT 8
.Os
.Sh NAME
@@ -41,8 +41,6 @@ statistics
.Nm
.Op Fl CdDITx
.Op Fl c Ar count
-.Op Fl M Ar core
-.Op Fl N Ar system
.Op Fl w Ar wait
.Op Ar drives
.Sh DESCRIPTION
@@ -106,13 +104,6 @@ transfers, and time spent in transfers.
Use of this flag disables the default display.
.It Fl I
Show the running total values, rather than an average.
-.It Fl M Ar core
-Extract values associated with the name list from the specified core
-instead of the default
-.Dq Pa /dev/mem .
-.It Fl N Ar system
-Extract the name list from the specified system instead of the default
-.Dq Pa /netbsd .
.It Fl T
Show tty statistics.
This is enabled by default unless the
@@ -191,13 +182,6 @@ Seconds spent in disk activity
% of CPU time in idle mode
.El
.El
-.Sh FILES
-.Bl -tag -width /dev/mem -compact
-.It Pa /netbsd
-Default kernel namelist.
-.It Pa /dev/mem
-Default memory file.
-.El
.Sh SEE ALSO
.Xr fstat 1 ,
.Xr netstat 1 ,
Index: src/usr.sbin/iostat/iostat.c
diff -u src/usr.sbin/iostat/iostat.c:1.60 src/usr.sbin/iostat/iostat.c:1.60.18.1
--- src/usr.sbin/iostat/iostat.c:1.60 Tue Aug 30 19:06:06 2011
+++ src/usr.sbin/iostat/iostat.c Sun Aug 10 06:59:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: iostat.c,v 1.60 2011/08/30 19:06:06 joerg Exp $ */
+/* $NetBSD: iostat.c,v 1.60.18.1 2014/08/10 06:59:37 tls Exp $ */
/*
* Copyright (c) 1996 John M. Vinopal
@@ -71,7 +71,7 @@ __COPYRIGHT("@(#) Copyright (c) 1986, 19
#if 0
static char sccsid[] = "@(#)iostat.c 8.3 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: iostat.c,v 1.60 2011/08/30 19:06:06 joerg Exp $");
+__RCSID("$NetBSD: iostat.c,v 1.60.18.1 2014/08/10 06:59:37 tls Exp $");
#endif
#endif /* not lint */
@@ -91,9 +91,6 @@ __RCSID("$NetBSD: iostat.c,v 1.60 2011/0
#include "drvstats.h"
-/* Namelist and memory files. */
-char *nlistf, *memf;
-
int hz;
static int reps, interval;
static int todo = 0;
@@ -130,7 +127,7 @@ main(int argc, char *argv[])
struct timespec tv;
struct ttysize ts;
- while ((ch = getopt(argc, argv, "Cc:dDIM:N:Tw:x")) != -1)
+ while ((ch = getopt(argc, argv, "Cc:dDITw:x")) != -1)
switch (ch) {
case 'c':
if ((reps = atoi(optarg)) <= 0)
@@ -150,12 +147,6 @@ main(int argc, char *argv[])
case 'I':
todo |= SHOW_TOTALS;
break;
- case 'M':
- memf = optarg;
- break;
- case 'N':
- nlistf = optarg;
- break;
case 'T':
todo |= SHOW_TTY;
break;
@@ -450,8 +441,8 @@ static void
usage(void)
{
- (void)fprintf(stderr, "usage: iostat [-CdDITx] [-c count] [-M core] "
- "[-N system] [-w wait] [drives]\n");
+ (void)fprintf(stderr, "usage: iostat [-CdDITx] [-c count] "
+ "[-w wait] [drives]\n");
exit(1);
}
