Fri Jan 7 03:12:27 2011 UTC ()

Maintain 5-character width of MB/s column by dynamically adjusting the
decimal precision.

This should work until disk transfer rates exceed 99999 MB/s.


(jakllsch)

diff -r1.23 -r1.24 src/usr.sbin/iostat/Makefile
diff -r1.53 -r1.54 src/usr.sbin/iostat/iostat.c

--- src/usr.sbin/iostat/Makefile 2006/04/21 13:46:37	1.23
+++ src/usr.sbin/iostat/Makefile 2011/01/07 03:12:27	1.24

 @@ -1,19 +1,19 @@
-#	$NetBSD: Makefile,v 1.23 2006/04/21 13:46:37 yamt Exp $
+#	$NetBSD: Makefile,v 1.24 2011/01/07 03:12:27 jakllsch Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
 .include <bsd.own.mk>
 PROG=	iostat
 MAN=	iostat.8
 .PATH:	${NETBSDSRCDIR}/usr.bin/vmstat
 CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/vmstat
 # drvstats.c pulled in from ../../usr.bin/vmstat
 SRCS=	drvstats.c iostat.c
-DPADD=	${LIBKVM}
+DPADD=	${LIBKVM} ${LIBM}
-LDADD=	-lkvm
+LDADD=	-lkvm -lm
 .include <bsd.prog.mk>

--- src/usr.sbin/iostat/iostat.c 2009/04/15 10:05:41	1.53
+++ src/usr.sbin/iostat/iostat.c 2011/01/07 03:12:27	1.54

 @@ -1,14 +1,14 @@
-/*	$NetBSD: iostat.c,v 1.53 2009/04/15 10:05:41 lukem Exp $	*/
+/*	$NetBSD: iostat.c,v 1.54 2011/01/07 03:12:27 jakllsch Exp $	*/
 /*
  * Copyright (c) 1996 John M. Vinopal
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -61,54 +61,57 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1986, 1991, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)iostat.c	8.3 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: iostat.c,v 1.53 2009/04/15 10:05:41 lukem Exp $");
+__RCSID("$NetBSD: iostat.c,v 1.54 2011/01/07 03:12:27 jakllsch Exp $");
 #endif
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/sched.h>
 #include <sys/time.h>
 #include <err.h>
 #include <ctype.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <math.h>
 #include "drvstats.h"
 /* Namelist and memory files. */
 char	*nlistf, *memf;
 int		hz, reps, interval;
 static int	todo = 0;
 static int	defdrives;
 static int	winlines = 20;
 static int	wincols = 80;
 #define	MAX(a,b)	(((a)>(b))?(a):(b))
 #define	ISSET(x, a)	((x) & (a))
 #define	SHOW_CPU	(1<<0)
 #define	SHOW_TTY	(1<<1)
 #define	SHOW_STATS_1	(1<<2)
 #define	SHOW_STATS_2	(1<<3)
 #define	SHOW_STATS_X	(1<<4)
 #define	SHOW_TOTALS	(1<<7)
 #define	SHOW_STATS_ALL	(SHOW_STATS_1 | SHOW_STATS_2 | SHOW_STATS_X)
 static void cpustats(void);
 static void drive_stats(double);
 static void drive_stats2(double);
 static void drive_statsx(double);
 @@ -329,27 +332,29 @@ drive_stats(double etime)
 		(void)printf(" %4.0f",
 		    (cur.rxfer[dn] + cur.wxfer[dn]) / etime);
 					/* time busy in drive activity */
 		atime = (double)cur.time[dn].tv_sec +
 		    ((double)cur.time[dn].tv_usec / (double)1000000);
 					/* Megabytes per second. */
 		if (atime != 0.0)
 			mbps = (cur.rbytes[dn] + cur.wbytes[dn]) /
 			    (double)(1024 * 1024);
 		else
 			mbps = 0;
-		(void)printf(" %5.2f ", mbps / etime);
+		mbps /= etime;
 		(void)printf(" %5.*f ",
 		    MAX(0,3-(int)floor(log10(fabs(fmax(1.0,mbps))))), mbps);
+	}
+}
 static void
 drive_stats2(double etime)
+{
 	size_t dn;
 	double atime;
 	for (dn = 0; dn < ndrive; ++dn) {
 		if (!cur.select[dn])
 			continue;