From fab3558f2ef5d6660ad9887eff5ef06989fe0030 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Thu, 1 Dec 2022 17:37:26 +0900 Subject: [PATCH] bdev: Change name and parameter order of function to dump I/O statistics For consistency, rename a JSON dump function by bdev_io_stat_dump_json() and change the parameter order. Other public APIs and function pointers in the generic bdev layer, spdk_bdev_dump_info_json(), spdk_bdev_fn_table::dump_info_json, and spdk_bdev_fn_table::write_config_json have a json_write_ctx pointer as the last parameter. For consistency, swap a statistics pointer and a json_write_ctx pointer. This is another preparation to extend I/O statistics to include error counters and module specific counters to output these via the bdev_get_iostat RPC. Signed-off-by: Shuhei Matsumoto Change-Id: I6f3bb6f2752f7da856d4fe66c0f1f8a2eedc176b Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15731 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Reviewed-by: Jim Harris Reviewed-by: Aleksey Marchuk --- lib/bdev/bdev.c | 2 +- lib/bdev/bdev_internal.h | 2 +- lib/bdev/bdev_rpc.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c index 063ad5da4..3ba471272 100644 --- a/lib/bdev/bdev.c +++ b/lib/bdev/bdev.c @@ -3706,7 +3706,7 @@ bdev_io_stat_free(struct spdk_bdev_io_stat *stat) } void -bdev_get_iostat_dump(struct spdk_json_write_ctx *w, struct spdk_bdev_io_stat *stat) +bdev_io_stat_dump_json(struct spdk_bdev_io_stat *stat, struct spdk_json_write_ctx *w) { spdk_json_write_named_uint64(w, "bytes_read", stat->bytes_read); spdk_json_write_named_uint64(w, "num_read_ops", stat->num_read_ops); diff --git a/lib/bdev/bdev_internal.h b/lib/bdev/bdev_internal.h index d9655db3c..0a9c6ec31 100644 --- a/lib/bdev/bdev_internal.h +++ b/lib/bdev/bdev_internal.h @@ -23,6 +23,6 @@ void bdev_io_submit(struct spdk_bdev_io *bdev_io); struct spdk_bdev_io_stat *bdev_io_stat_alloc(void); void bdev_io_stat_free(struct spdk_bdev_io_stat *stat); -void bdev_get_iostat_dump(struct spdk_json_write_ctx *w, struct spdk_bdev_io_stat *stat); +void bdev_io_stat_dump_json(struct spdk_bdev_io_stat *stat, struct spdk_json_write_ctx *w); #endif /* SPDK_BDEV_INTERNAL_H */ diff --git a/lib/bdev/bdev_rpc.c b/lib/bdev/bdev_rpc.c index 78d88a37f..e0ecb9db6 100644 --- a/lib/bdev/bdev_rpc.c +++ b/lib/bdev/bdev_rpc.c @@ -263,7 +263,7 @@ bdev_get_iostat_done(struct spdk_bdev *bdev, struct spdk_bdev_io_stat *stat, spdk_json_write_named_string(w, "name", spdk_bdev_get_name(bdev)); - bdev_get_iostat_dump(w, stat); + bdev_io_stat_dump_json(stat, w); if (spdk_bdev_get_qd_sampling_period(bdev)) { spdk_json_write_named_uint64(w, "queue_depth_polling_period", @@ -337,7 +337,7 @@ bdev_get_per_channel_stat(struct spdk_bdev_channel_iter *i, struct spdk_bdev *bd spdk_json_write_object_begin(w); spdk_json_write_named_uint64(w, "thread_id", spdk_thread_get_id(spdk_get_thread())); - bdev_get_iostat_dump(w, bdev_ctx->stat); + bdev_io_stat_dump_json(bdev_ctx->stat, w); spdk_json_write_object_end(w); spdk_bdev_for_each_channel_continue(i, 0);