Add more devstat calculations, mostly filling in holes, but also adding

a couple of reqests:  DSM_BUSY_PCT and DSM_QUEUE_LENGTH.

I have no further plans for mutilating this API at this point in
time, and will update the man-page to reflect current reality as
the next thing.

Reviewed by:    ken

1 files changed, 13 insertions, 2 deletions

diff --git a/lib/libdevstat/devstat.h b/lib/libdevstat/devstat.h
index 09af217..9c6a951 100644
--- a/lib/libdevstat/devstat.h
+++ b/lib/libdevstat/devstat.h
@@ -61,29 +61,40 @@ typedef enum {
 	DSM_TOTAL_BYTES,
 	DSM_TOTAL_BYTES_READ,
 	DSM_TOTAL_BYTES_WRITE,
+	DSM_TOTAL_BYTES_FREE,
 	DSM_TOTAL_TRANSFERS,
+	DSM_TOTAL_TRANSFERS_OTHER,
 	DSM_TOTAL_TRANSFERS_READ,
 	DSM_TOTAL_TRANSFERS_WRITE,
-	DSM_TOTAL_TRANSFERS_OTHER,
+	DSM_TOTAL_TRANSFERS_FREE,
 	DSM_TOTAL_BLOCKS,
 	DSM_TOTAL_BLOCKS_READ,
 	DSM_TOTAL_BLOCKS_WRITE,
+	DSM_TOTAL_BLOCKS_FREE,
 	DSM_KB_PER_TRANSFER,
 	DSM_KB_PER_TRANSFER_READ,
 	DSM_KB_PER_TRANSFER_WRITE,
+	DSM_KB_PER_TRANSFER_FREE,
 	DSM_TRANSFERS_PER_SECOND,
+	DSM_TRANSFERS_PER_SECOND_OTHER,
 	DSM_TRANSFERS_PER_SECOND_READ,
 	DSM_TRANSFERS_PER_SECOND_WRITE,
-	DSM_TRANSFERS_PER_SECOND_OTHER,
+	DSM_TRANSFERS_PER_SECOND_FREE,
 	DSM_MB_PER_SECOND,
 	DSM_MB_PER_SECOND_READ,
 	DSM_MB_PER_SECOND_WRITE,
+	DSM_MB_PER_SECOND_FREE,
 	DSM_BLOCKS_PER_SECOND,
 	DSM_BLOCKS_PER_SECOND_READ,
 	DSM_BLOCKS_PER_SECOND_WRITE,
+	DSM_BLOCKS_PER_SECOND_FREE,
 	DSM_MS_PER_TRANSACTION,
+	DSM_MS_PER_TRANSACTION_OTHER,
 	DSM_MS_PER_TRANSACTION_READ,
 	DSM_MS_PER_TRANSACTION_WRITE,
+	DSM_MS_PER_TRANSACTION_FREE,
+	DSM_BUSY_PCT,
+	DSM_QUEUE_LENGTH,
 	DSM_SKIP,
 	DSM_MAX
 } devstat_metric;