From 7aeaa880b1de7bc2bef9552ed3e11b2da0fd1692 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Fri, 1 Feb 2019 15:04:54 +0900 Subject: [PATCH] event: Use spdk_json_write_named_* APIs throughout Change-Id: I1997a6653d4f27ff4c140657f91d5bcfe12e34b4 Signed-off-by: Shuhei Matsumoto Reviewed-on: https://review.gerrithub.io/c/442949 Tested-by: SPDK CI Jenkins Chandler-Test-Pool: SPDK Automated Test System Reviewed-by: Darek Stojaczyk Reviewed-by: Ben Walker --- lib/event/rpc/app_rpc.c | 3 +- lib/event/subsystems/nvmf/nvmf_rpc.c | 51 +++++++++++----------------- 2 files changed, 20 insertions(+), 34 deletions(-) diff --git a/lib/event/rpc/app_rpc.c b/lib/event/rpc/app_rpc.c index 9cf192119..6f663f130 100644 --- a/lib/event/rpc/app_rpc.c +++ b/lib/event/rpc/app_rpc.c @@ -146,8 +146,7 @@ spdk_rpc_context_switch_monitor(struct spdk_jsonrpc_request *request, spdk_json_write_object_begin(w); - spdk_json_write_name(w, "enabled"); - spdk_json_write_bool(w, spdk_reactor_context_switch_monitor_enabled()); + spdk_json_write_named_bool(w, "enabled", spdk_reactor_context_switch_monitor_enabled()); spdk_json_write_object_end(w); spdk_jsonrpc_end_result(request, w); diff --git a/lib/event/subsystems/nvmf/nvmf_rpc.c b/lib/event/subsystems/nvmf/nvmf_rpc.c index adb34f002..4423b5b43 100644 --- a/lib/event/subsystems/nvmf/nvmf_rpc.c +++ b/lib/event/subsystems/nvmf/nvmf_rpc.c @@ -189,8 +189,7 @@ dump_nvmf_subsystem(struct spdk_json_write_ctx *w, struct spdk_nvmf_subsystem *s spdk_json_write_object_begin(w); - spdk_json_write_name(w, "nqn"); - spdk_json_write_string(w, spdk_nvmf_subsystem_get_nqn(subsystem)); + spdk_json_write_named_string(w, "nqn", spdk_nvmf_subsystem_get_nqn(subsystem)); spdk_json_write_name(w, "subtype"); if (spdk_nvmf_subsystem_get_type(subsystem) == SPDK_NVMF_SUBTYPE_NVME) { spdk_json_write_string(w, "NVMe"); @@ -198,8 +197,7 @@ dump_nvmf_subsystem(struct spdk_json_write_ctx *w, struct spdk_nvmf_subsystem *s spdk_json_write_string(w, "Discovery"); } - spdk_json_write_name(w, "listen_addresses"); - spdk_json_write_array_begin(w); + spdk_json_write_named_array_begin(w, "listen_addresses"); for (listener = spdk_nvmf_subsystem_get_first_listener(subsystem); listener != NULL; listener = spdk_nvmf_subsystem_get_next_listener(subsystem, listener)) { @@ -219,31 +217,24 @@ dump_nvmf_subsystem(struct spdk_json_write_ctx *w, struct spdk_nvmf_subsystem *s adrfam = "unknown"; } /* NOTE: "transport" is kept for compatibility; new code should use "trtype" */ - spdk_json_write_name(w, "transport"); - spdk_json_write_string(w, trtype); - spdk_json_write_name(w, "trtype"); - spdk_json_write_string(w, trtype); - spdk_json_write_name(w, "adrfam"); - spdk_json_write_string(w, adrfam); - spdk_json_write_name(w, "traddr"); - spdk_json_write_string(w, trid->traddr); - spdk_json_write_name(w, "trsvcid"); - spdk_json_write_string(w, trid->trsvcid); + spdk_json_write_named_string(w, "transport", trtype); + spdk_json_write_named_string(w, "trtype", trtype); + spdk_json_write_named_string(w, "adrfam", adrfam); + spdk_json_write_named_string(w, "traddr", trid->traddr); + spdk_json_write_named_string(w, "trsvcid", trid->trsvcid); spdk_json_write_object_end(w); } spdk_json_write_array_end(w); - spdk_json_write_name(w, "allow_any_host"); - spdk_json_write_bool(w, spdk_nvmf_subsystem_get_allow_any_host(subsystem)); + spdk_json_write_named_bool(w, "allow_any_host", + spdk_nvmf_subsystem_get_allow_any_host(subsystem)); - spdk_json_write_name(w, "hosts"); - spdk_json_write_array_begin(w); + spdk_json_write_named_array_begin(w, "hosts"); for (host = spdk_nvmf_subsystem_get_first_host(subsystem); host != NULL; host = spdk_nvmf_subsystem_get_next_host(subsystem, host)) { spdk_json_write_object_begin(w); - spdk_json_write_name(w, "nqn"); - spdk_json_write_string(w, spdk_nvmf_host_get_nqn(host)); + spdk_json_write_named_string(w, "nqn", spdk_nvmf_host_get_nqn(host)); spdk_json_write_object_end(w); } spdk_json_write_array_end(w); @@ -253,27 +244,24 @@ dump_nvmf_subsystem(struct spdk_json_write_ctx *w, struct spdk_nvmf_subsystem *s struct spdk_nvmf_ns_opts ns_opts; uint32_t max_namespaces; - spdk_json_write_name(w, "serial_number"); - spdk_json_write_string(w, spdk_nvmf_subsystem_get_sn(subsystem)); + spdk_json_write_named_string(w, "serial_number", spdk_nvmf_subsystem_get_sn(subsystem)); max_namespaces = spdk_nvmf_subsystem_get_max_namespaces(subsystem); if (max_namespaces != 0) { spdk_json_write_named_uint32(w, "max_namespaces", max_namespaces); } - spdk_json_write_name(w, "namespaces"); - spdk_json_write_array_begin(w); + spdk_json_write_named_array_begin(w, "namespaces"); for (ns = spdk_nvmf_subsystem_get_first_ns(subsystem); ns != NULL; ns = spdk_nvmf_subsystem_get_next_ns(subsystem, ns)) { spdk_nvmf_ns_get_opts(ns, &ns_opts, sizeof(ns_opts)); spdk_json_write_object_begin(w); - spdk_json_write_name(w, "nsid"); - spdk_json_write_int32(w, spdk_nvmf_ns_get_id(ns)); - spdk_json_write_name(w, "bdev_name"); - spdk_json_write_string(w, spdk_bdev_get_name(spdk_nvmf_ns_get_bdev(ns))); + spdk_json_write_named_int32(w, "nsid", spdk_nvmf_ns_get_id(ns)); + spdk_json_write_named_string(w, "bdev_name", + spdk_bdev_get_name(spdk_nvmf_ns_get_bdev(ns))); /* NOTE: "name" is kept for compatibility only - new code should use bdev_name. */ - spdk_json_write_name(w, "name"); - spdk_json_write_string(w, spdk_bdev_get_name(spdk_nvmf_ns_get_bdev(ns))); + spdk_json_write_named_string(w, "name", + spdk_bdev_get_name(spdk_nvmf_ns_get_bdev(ns))); if (!spdk_mem_all_zero(ns_opts.nguid, sizeof(ns_opts.nguid))) { spdk_json_write_name(w, "nguid"); @@ -289,8 +277,7 @@ dump_nvmf_subsystem(struct spdk_json_write_ctx *w, struct spdk_nvmf_subsystem *s char uuid_str[SPDK_UUID_STRING_LEN]; spdk_uuid_fmt_lower(uuid_str, sizeof(uuid_str), &ns_opts.uuid); - spdk_json_write_name(w, "uuid"); - spdk_json_write_string(w, uuid_str); + spdk_json_write_named_string(w, "uuid", uuid_str); } spdk_json_write_object_end(w);