From d440a1953882f14c47c41bdf5449655e10c6f779 Mon Sep 17 00:00:00 2001 From: Michael Piszczek Date: Wed, 3 Nov 2021 19:48:10 -0400 Subject: [PATCH] spdk_top: Remove double sorting when getting poller data No longer need the extra double sort the poller data since the data is now always double sorted. Signed-off-by: Michael Piszczek Change-Id: Ic2edf92ec4374c3fb1c2a3ad8d2ba7c111e2e481 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10107 Tested-by: SPDK CI Jenkins Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris Reviewed-by: Ben Walker Reviewed-by: Krzysztof Karas --- app/spdk_top/spdk_top.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/app/spdk_top/spdk_top.c b/app/spdk_top/spdk_top.c index f1c3a2351..00f7941ce 100644 --- a/app/spdk_top/spdk_top.c +++ b/app/spdk_top/spdk_top.c @@ -851,11 +851,7 @@ subsort_pollers(enum column_pollers_type sort_column, const void *p1, const void } static int -#ifdef __FreeBSD__ -sort_pollers(void *arg, const void *p1, const void *p2) -#else -sort_pollers(const void *p1, const void *p2, void *arg) -#endif +sort_pollers(const void *p1, const void *p2) { int rc; @@ -874,7 +870,6 @@ get_pollers_data(void) uint64_t i = 0; uint32_t current_pollers_count; struct rpc_poller_info pollers_info[RPC_MAX_POLLERS]; - enum column_pollers_type column_sort; rc = rpc_send_req("thread_get_pollers", &json_resp); if (rc) { @@ -906,12 +901,7 @@ get_pollers_data(void) g_last_pollers_count = current_pollers_count; - column_sort = COL_POLLERS_NAME; - qsort_r(&pollers_info, g_last_pollers_count, sizeof(struct rpc_poller_info), sort_pollers, - (void *)&column_sort); - column_sort = g_current_sort_col[POLLERS_TAB]; - qsort_r(&pollers_info, g_last_pollers_count, sizeof(struct rpc_poller_info), sort_pollers, - (void *)&column_sort); + qsort(&pollers_info, g_last_pollers_count, sizeof(struct rpc_poller_info), sort_pollers); memcpy(&g_pollers_info, &pollers_info, sizeof(struct rpc_poller_info) * g_last_pollers_count);