summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2014-05-17 15:26:08 +0000
committermav <mav@FreeBSD.org>2014-05-17 15:26:08 +0000
commita818dea3784b972aeb788d779d0cfdd392f3506b (patch)
treebe3d4c911bf644befb5e55c3ec3c7cdba912538b
parentb0e1e69974fc28360edef75382b3fb857a4b3f89 (diff)
downloadFreeBSD-src-a818dea3784b972aeb788d779d0cfdd392f3506b.zip
FreeBSD-src-a818dea3784b972aeb788d779d0cfdd392f3506b.tar.gz
Add -o option to gstat to display "other" operatins (e.g. BIO_FLUSH).
MFC after: 1 week
-rw-r--r--usr.sbin/gstat/gstat.87
-rw-r--r--usr.sbin/gstat/gstat.c24
2 files changed, 26 insertions, 5 deletions
diff --git a/usr.sbin/gstat/gstat.8 b/usr.sbin/gstat/gstat.8
index 9ac6789..7897a62 100644
--- a/usr.sbin/gstat/gstat.8
+++ b/usr.sbin/gstat/gstat.8
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd March 12, 2009
+.Dd May 17, 2014
.Dt GSTAT 8
.Os
.Sh NAME
@@ -32,7 +32,7 @@
.Nd print statistics about GEOM disks
.Sh SYNOPSIS
.Nm
-.Op Fl abcd
+.Op Fl abcdo
.Op Fl f Ar filter
.Op Fl I Ar interval
.Sh DESCRIPTION
@@ -69,6 +69,9 @@ Only devices with the names matching
will be displayed.
The format of the regular expression is described in
.Xr re_format 7 .
+.It Fl o
+Enable display of statistics for other operations
+.Pq Dv BIO_FLUSH .
.It Fl I Ar interval
Refresh the
.Nm
diff --git a/usr.sbin/gstat/gstat.c b/usr.sbin/gstat/gstat.c
index 39054eb..d3aeae0 100644
--- a/usr.sbin/gstat/gstat.c
+++ b/usr.sbin/gstat/gstat.c
@@ -51,7 +51,7 @@
#include <sysexits.h>
#include <unistd.h>
-static int flag_a, flag_b, flag_c, flag_d;
+static int flag_a, flag_b, flag_c, flag_d, flag_o;
static int flag_I = 1000000;
#define PRINTMSG(...) do { \
@@ -88,7 +88,7 @@ main(int argc, char **argv)
char *p;
char f_s[100], pf_s[100], tmp_f_s[100];
const char *line;
- long double ld[11];
+ long double ld[13];
uint64_t u64;
EditLine *el;
History *hist;
@@ -104,7 +104,7 @@ main(int argc, char **argv)
flag_b = 1;
f_s[0] = '\0';
- while ((i = getopt(argc, argv, "adcf:I:b")) != -1) {
+ while ((i = getopt(argc, argv, "abdcf:oI:")) != -1) {
switch (i) {
case 'a':
flag_a = 1;
@@ -126,6 +126,9 @@ main(int argc, char **argv)
"Invalid filter - see re_format(7)");
strncpy(f_s, optarg, sizeof(f_s));
break;
+ case 'o':
+ flag_o = 1;
+ break;
case 'I':
p = NULL;
i = strtoul(optarg, &p, 0);
@@ -229,6 +232,8 @@ main(int argc, char **argv)
PRINTMSG(" w/s kBps ms/w ");
if (flag_d)
PRINTMSG(" d/s kBps ms/d ");
+ if (flag_o)
+ PRINTMSG(" o/s ms/o ");
PRINTMSG("%%busy Name\n");
for (;;) {
gsp = geom_stats_snapshot_next(sp);
@@ -279,9 +284,14 @@ main(int argc, char **argv)
DSM_MS_PER_TRANSACTION_WRITE, &ld[6],
DSM_BUSY_PCT, &ld[7],
+
DSM_TRANSFERS_PER_SECOND_FREE, &ld[8],
DSM_MB_PER_SECOND_FREE, &ld[9],
DSM_MS_PER_TRANSACTION_FREE, &ld[10],
+
+ DSM_TRANSFERS_PER_SECOND_OTHER, &ld[11],
+ DSM_MS_PER_TRANSACTION_OTHER, &ld[12],
+
DSM_NONE);
if (flag_a && ld[7] < 0.1) {
@@ -313,6 +323,14 @@ main(int argc, char **argv)
PRINTMSG(" %6.1f", (double)ld[10]);
}
+ if (flag_o) {
+ PRINTMSG(" %6.0f", (double)ld[11]);
+ if (ld[12] > 1e3)
+ PRINTMSG(" %6.0f", (double)ld[12]);
+ else
+ PRINTMSG(" %6.1f", (double)ld[12]);
+ }
+
if (ld[7] > 80)
i = 3;
else if (ld[7] > 50)
OpenPOWER on IntegriCloud