From c3e625ba2bbc66d4f84f86e00dea46929c5e9d9a Mon Sep 17 00:00:00 2001 From: Krzysztof Karas Date: Wed, 2 Jun 2021 10:12:29 +0200 Subject: [PATCH] spdk_top: create local poller structure to fill with RPC data Create local structs to fill with RPC data, sort and then copy into a global poller array inside get_pollers_data(). Signed-off-by: Krzysztof Karas Change-Id: I545392cbdc699e4d96f1d39611a6e694e209c25d Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8234 Community-CI: Mellanox Build Bot Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Tomasz Zawadzki --- app/spdk_top/spdk_top.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/app/spdk_top/spdk_top.c b/app/spdk_top/spdk_top.c index 33862f060..40fcc9f1e 100644 --- a/app/spdk_top/spdk_top.c +++ b/app/spdk_top/spdk_top.c @@ -848,12 +848,24 @@ get_pollers_data(void) struct spdk_jsonrpc_client_response *json_resp = NULL; int rc = 0; uint64_t i = 0; + uint32_t current_pollers_count; + struct rpc_poller_info pollers_info[RPC_MAX_POLLERS]; rc = rpc_send_req("thread_get_pollers", &json_resp); if (rc) { return rc; } + /* Decode json */ + memset(&pollers_info, 0, sizeof(pollers_info)); + if (rpc_decode_pollers_threads_array(json_resp->result, pollers_info, ¤t_pollers_count)) { + rc = -EINVAL; + for (i = 0; i < current_pollers_count; i++) { + free_rpc_poller(&pollers_info[i]); + } + goto end; + } + pthread_mutex_lock(&g_thread_lock); /* Save last run counter of each poller before updating g_pollers_stats. */ @@ -867,13 +879,13 @@ get_pollers_data(void) free_rpc_poller(&g_pollers_info[i]); } - /* Decode json */ - memset(&g_pollers_info, 0, sizeof(g_pollers_info)); - if (rpc_decode_pollers_threads_array(json_resp->result, g_pollers_info, &g_last_pollers_count)) { - rc = -EINVAL; - } + g_last_pollers_count = current_pollers_count; + + memcpy(&g_pollers_info, &pollers_info, sizeof(struct rpc_poller_info) * g_last_pollers_count); pthread_mutex_unlock(&g_thread_lock); + +end: spdk_jsonrpc_client_free_response(json_resp); return rc; }