d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix JSON output.

Browse Source 
MFC after:	1 week
This commit is contained in:
Alexander Motin 2017-03-03 11:21:13 +00:00
parent fa42250152
commit 924233eb75
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=314592
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
usr.bin/ctlstat/ctlstat.c
View File

@ -312,8 +312,8 @@ compute_stats(struct ctl_io_stats *cur_stats,
* conducive to programming, however.
*/
#define PRINT_BINTIME(prefix, bt) \
printf("%s %jd.%06ju\n", prefix, (intmax_t)(bt).sec, \
#define PRINT_BINTIME(bt) \
printf("%jd.%06ju", (intmax_t)(bt).sec, \
(uintmax_t)(((bt).frac >> 32) * 1000000 >> 32))
static const char *iotypes[] = {"NO IO", "READ", "WRITE"};
@ -335,15 +335,15 @@ ctlstat_dump(struct ctlstat_context *ctx)
stats[i].operations[iotype]);
printf(" dmas %ju\n", (uintmax_t)
stats[i].dmas[iotype]);
PRINT_BINTIME(" io time", stats[i].time[iotype]);
PRINT_BINTIME(" dma time", stats[i].dma_time[iotype]);
printf(" io time ");
PRINT_BINTIME(stats[i].time[iotype]);
printf("\n dma time ");
PRINT_BINTIME(stats[i].dma_time[iotype]);
printf("\n");
}
}
}
#define JSON_BINTIME(prefix, bt) \
printf("\"%s\":%jd.%06ju,", prefix, (intmax_t)(bt).sec, \
(uintmax_t)(((bt).frac >> 32) * 1000000 >> 32))
static void
ctlstat_json(struct ctlstat_context *ctx) {
int iotype, i;
@ -357,14 +357,17 @@ ctlstat_json(struct ctlstat_context *ctx) {
stats[i].item);
for (iotype = 0; iotype < CTL_STATS_NUM_TYPES; iotype++) {
printf("{\"type\":\"%s\",", iotypes[iotype]);
printf("\"bytes\":%ju,", (uintmax_t)stats[
i].bytes[iotype]);
printf("\"operations\":%ju,", (uintmax_t)stats[
i].operations[iotype]);
printf("\"dmas\":%ju}", (uintmax_t)
printf("\"bytes\":%ju,", (uintmax_t)
stats[i].bytes[iotype]);
printf("\"operations\":%ju,", (uintmax_t)
stats[i].operations[iotype]);
printf("\"dmas\":%ju,", (uintmax_t)
stats[i].dmas[iotype]);
JSON_BINTIME("io time", stats[i].time[iotype]);
JSON_BINTIME("dma time", stats[i].dma_time[iotype]);
printf("\"io time\":");
PRINT_BINTIME(stats[i].time[iotype]);
printf(",\"dma time\":");
PRINT_BINTIME(stats[i].dma_time[iotype]);
printf("}");
if (iotype < (CTL_STATS_NUM_TYPES - 1))
printf(","); /* continue io array */
}