summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2003-03-19 14:11:14 +0000
committerphk <phk@FreeBSD.org>2003-03-19 14:11:14 +0000
commit55b12ff6911e549bc8c00b9781d419032f098d94 (patch)
tree0807e8e71b64aa93e0ee6f4669838a84f8de41a2
parent791c39f548db6fb2fb0c90923d3e40831d869955 (diff)
downloadFreeBSD-src-55b12ff6911e549bc8c00b9781d419032f098d94.zip
FreeBSD-src-55b12ff6911e549bc8c00b9781d419032f098d94.tar.gz
Further unbreak devstat: sort the index array in correct order too.
-rw-r--r--lib/libdevstat/devstat.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/libdevstat/devstat.c b/lib/libdevstat/devstat.c
index a120b4f..4f38c06 100644
--- a/lib/libdevstat/devstat.c
+++ b/lib/libdevstat/devstat.c
@@ -89,41 +89,41 @@ struct devstat_args {
{ DSM_TOTAL_BYTES, DEVSTAT_ARG_UINT64 },
{ DSM_TOTAL_BYTES_READ, DEVSTAT_ARG_UINT64 },
{ DSM_TOTAL_BYTES_WRITE, DEVSTAT_ARG_UINT64 },
- { DSM_TOTAL_BYTES_FREE, DEVSTAT_ARG_UINT64 },
{ DSM_TOTAL_TRANSFERS, DEVSTAT_ARG_UINT64 },
- { DSM_TOTAL_TRANSFERS_OTHER, DEVSTAT_ARG_UINT64 },
{ DSM_TOTAL_TRANSFERS_READ, DEVSTAT_ARG_UINT64 },
{ DSM_TOTAL_TRANSFERS_WRITE, DEVSTAT_ARG_UINT64 },
- { DSM_TOTAL_TRANSFERS_FREE, DEVSTAT_ARG_UINT64 },
+ { DSM_TOTAL_TRANSFERS_OTHER, DEVSTAT_ARG_UINT64 },
{ DSM_TOTAL_BLOCKS, DEVSTAT_ARG_UINT64 },
{ DSM_TOTAL_BLOCKS_READ, DEVSTAT_ARG_UINT64 },
{ DSM_TOTAL_BLOCKS_WRITE, DEVSTAT_ARG_UINT64 },
- { DSM_TOTAL_BLOCKS_FREE, DEVSTAT_ARG_UINT64 },
{ DSM_KB_PER_TRANSFER, DEVSTAT_ARG_LD },
{ DSM_KB_PER_TRANSFER_READ, DEVSTAT_ARG_LD },
{ DSM_KB_PER_TRANSFER_WRITE, DEVSTAT_ARG_LD },
- { DSM_KB_PER_TRANSFER_FREE, DEVSTAT_ARG_LD },
{ DSM_TRANSFERS_PER_SECOND, DEVSTAT_ARG_LD },
{ DSM_TRANSFERS_PER_SECOND_READ, DEVSTAT_ARG_LD },
{ DSM_TRANSFERS_PER_SECOND_WRITE, DEVSTAT_ARG_LD },
- { DSM_TRANSFERS_PER_SECOND_FREE, DEVSTAT_ARG_LD },
{ DSM_TRANSFERS_PER_SECOND_OTHER, DEVSTAT_ARG_LD },
{ DSM_MB_PER_SECOND, DEVSTAT_ARG_LD },
{ DSM_MB_PER_SECOND_READ, DEVSTAT_ARG_LD },
{ DSM_MB_PER_SECOND_WRITE, DEVSTAT_ARG_LD },
- { DSM_MB_PER_SECOND_FREE, DEVSTAT_ARG_LD },
{ DSM_BLOCKS_PER_SECOND, DEVSTAT_ARG_LD },
{ DSM_BLOCKS_PER_SECOND_READ, DEVSTAT_ARG_LD },
{ DSM_BLOCKS_PER_SECOND_WRITE, DEVSTAT_ARG_LD },
- { DSM_BLOCKS_PER_SECOND_FREE, DEVSTAT_ARG_LD },
{ DSM_MS_PER_TRANSACTION, DEVSTAT_ARG_LD },
{ DSM_MS_PER_TRANSACTION_READ, DEVSTAT_ARG_LD },
{ DSM_MS_PER_TRANSACTION_WRITE, DEVSTAT_ARG_LD },
- { DSM_MS_PER_TRANSACTION_FREE, DEVSTAT_ARG_LD },
+ { DSM_SKIP, DEVSTAT_ARG_SKIP }
+ { DSM_TOTAL_BYTES_FREE, DEVSTAT_ARG_UINT64 },
+ { DSM_TOTAL_TRANSFERS_FREE, DEVSTAT_ARG_UINT64 },
+ { DSM_TOTAL_BLOCKS_FREE, DEVSTAT_ARG_UINT64 },
+ { DSM_KB_PER_TRANSFER_FREE, DEVSTAT_ARG_LD },
+ { DSM_MB_PER_SECOND_FREE, DEVSTAT_ARG_LD },
+ { DSM_TRANSFERS_PER_SECOND_FREE, DEVSTAT_ARG_LD },
+ { DSM_BLOCKS_PER_SECOND_FREE, DEVSTAT_ARG_LD },
{ DSM_MS_PER_TRANSACTION_OTHER, DEVSTAT_ARG_LD },
+ { DSM_MS_PER_TRANSACTION_FREE, DEVSTAT_ARG_LD },
{ DSM_BUSY_PCT, DEVSTAT_ARG_LD },
{ DSM_QUEUE_LENGTH, DEVSTAT_ARG_UINT64 },
- { DSM_SKIP, DEVSTAT_ARG_SKIP }
};
static const char *namelist[] = {
OpenPOWER on IntegriCloud