From d16bdb30b9f7811c3be3fe7b5843e5fd1d3e84de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Mon, 9 Oct 2023 16:40:47 +0800 Subject: [PATCH] DiskIO: update formatting help messages; update json keys --- src/modules/diskio/diskio.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/modules/diskio/diskio.c b/src/modules/diskio/diskio.c index fee2dfcb9..cb7c981dc 100644 --- a/src/modules/diskio/diskio.c +++ b/src/modules/diskio/diskio.c @@ -6,7 +6,7 @@ #include "util/stringUtils.h" #define FF_DISKIO_DISPLAY_NAME "Disk IO" -#define FF_DISKIO_NUM_FORMAT_ARGS 7 +#define FF_DISKIO_NUM_FORMAT_ARGS 10 static int sortDevices(const FFDiskIOResult* left, const FFDiskIOResult* right) { @@ -181,19 +181,19 @@ void ffGenerateDiskIOJson(FFDiskIOOptions* options, yyjson_mut_doc* doc, yyjson_ { yyjson_mut_val* obj = yyjson_mut_arr_add_obj(doc, arr); yyjson_mut_obj_add_strbuf(doc, obj, "name", &dev->name); - yyjson_mut_obj_add_strbuf(doc, obj, "interconnect", &dev->interconnect); + yyjson_mut_obj_add_strbuf(doc, obj, "interconnectType", &dev->interconnect); yyjson_mut_obj_add_strbuf(doc, obj, "devPath", &dev->devPath); switch(dev->type) { case FF_DISKIO_PHYSICAL_TYPE_HDD: - yyjson_mut_obj_add_str(doc, obj, "type", "HDD"); + yyjson_mut_obj_add_str(doc, obj, "physicalType", "HDD"); break; case FF_DISKIO_PHYSICAL_TYPE_SSD: - yyjson_mut_obj_add_str(doc, obj, "type", "SSD"); + yyjson_mut_obj_add_str(doc, obj, "physicalType", "SSD"); break; default: - yyjson_mut_obj_add_null(doc, obj, "type"); + yyjson_mut_obj_add_null(doc, obj, "physicalType"); break; } @@ -217,7 +217,8 @@ void ffPrintDiskIOHelpFormat(void) "Size of data read per second (formatted)", "Size of data written per second (formatted)", "Device name", - "Device type", + "Device interconnect type", + "Device physical type (SSD / HDD)", "Device raw file path", "Size of data read per second (in bytes)", "Size of data written per second (in bytes)",