ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spdk_top: add core frequency to CORES tab

Browse Source 
Modifies functions and data structures to allow for
core frequency display in CORES tab.

Signed-off-by: Krzysztof Karas <krzysztof.karas@intel.com>
Change-Id: Ie3c6eadb090b8e0a6e57968b79d4852f1957b0fc
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6583
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Community-CI: Mellanox Build Bot
This commit is contained in:
Krzysztof Karas 2021-02-26 10:36:57 +01:00 committed by Jim Harris
parent 8673a27b46
commit bc656341b7
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/spdk_top/spdk_top.c
View File

@ -84,6 +84,7 @@
#define MAX_POLLER_IND_STR_LEN 8 #define MAX_POLLER_IND_STR_LEN 8
#define MAX_CORE_MASK_STR_LEN 16 #define MAX_CORE_MASK_STR_LEN 16
#define MAX_CORE_STR_LEN 6 #define MAX_CORE_STR_LEN 6
#define MAX_CORE_FREQ_STR_LEN 18
#define MAX_TIME_STR_LEN 12 #define MAX_TIME_STR_LEN 12
#define MAX_POLLER_RUN_COUNT 20 #define MAX_POLLER_RUN_COUNT 20
#define MAX_PERIOD_STR_LEN 12 #define MAX_PERIOD_STR_LEN 12
@ -178,6 +179,7 @@ static struct col_desc g_col_desc[NUMBER_OF_TABS][TABS_COL_COUNT] = {
{.name = "Poller count", .max_data_string = MAX_POLLER_COUNT_STR_LEN}, {.name = "Poller count", .max_data_string = MAX_POLLER_COUNT_STR_LEN},
{.name = "Idle [us]", .max_data_string = MAX_TIME_STR_LEN}, {.name = "Idle [us]", .max_data_string = MAX_TIME_STR_LEN},
{.name = "Busy [us]", .max_data_string = MAX_TIME_STR_LEN}, {.name = "Busy [us]", .max_data_string = MAX_TIME_STR_LEN},
{.name = "Frequency [MHz]", .max_data_string = MAX_CORE_FREQ_STR_LEN},
{.name = (char *)NULL} {.name = (char *)NULL}
} }
}; };
@ -256,6 +258,7 @@ struct rpc_core_info {
uint32_t lcore; uint32_t lcore;
uint64_t busy; uint64_t busy;
uint64_t idle; uint64_t idle;
uint32_t core_freq;
struct rpc_core_threads threads; struct rpc_core_threads threads;
}; };
@ -473,6 +476,7 @@ static const struct spdk_json_object_decoder rpc_core_info_decoders[] = {
{"lcore", offsetof(struct rpc_core_info, lcore), spdk_json_decode_uint32}, {"lcore", offsetof(struct rpc_core_info, lcore), spdk_json_decode_uint32},
{"busy", offsetof(struct rpc_core_info, busy), spdk_json_decode_uint64}, {"busy", offsetof(struct rpc_core_info, busy), spdk_json_decode_uint64},
{"idle", offsetof(struct rpc_core_info, idle), spdk_json_decode_uint64}, {"idle", offsetof(struct rpc_core_info, idle), spdk_json_decode_uint64},
{"core_freq", offsetof(struct rpc_core_info, core_freq), spdk_json_decode_uint32},
{"lw_threads", offsetof(struct rpc_core_info, threads), rpc_decode_cores_lw_threads}, {"lw_threads", offsetof(struct rpc_core_info, threads), rpc_decode_cores_lw_threads},
}; };
@ -1364,7 +1368,8 @@ refresh_cores_tab(uint8_t current_page)
uint8_t max_pages, item_index; uint8_t max_pages, item_index;
static uint8_t last_page = 0; static uint8_t last_page = 0;
char core[MAX_CORE_STR_LEN], threads_number[MAX_THREAD_COUNT_STR_LEN], char core[MAX_CORE_STR_LEN], threads_number[MAX_THREAD_COUNT_STR_LEN],
pollers_number[MAX_POLLER_COUNT_STR_LEN], idle_time[MAX_TIME_STR_LEN], busy_time[MAX_TIME_STR_LEN]; pollers_number[MAX_POLLER_COUNT_STR_LEN], idle_time[MAX_TIME_STR_LEN],
busy_time[MAX_TIME_STR_LEN], core_freq[MAX_CORE_FREQ_STR_LEN];
struct core_info cores[RPC_MAX_CORES]; struct core_info cores[RPC_MAX_CORES];
memset(&cores, 0, sizeof(cores)); memset(&cores, 0, sizeof(cores));
@ -1450,6 +1455,18 @@ refresh_cores_tab(uint8_t current_page)
} }
print_max_len(g_tabs[CORES_TAB], TABS_DATA_START_ROW + item_index, offset, print_max_len(g_tabs[CORES_TAB], TABS_DATA_START_ROW + item_index, offset,
col_desc[4].max_data_string, ALIGN_RIGHT, busy_time); col_desc[4].max_data_string, ALIGN_RIGHT, busy_time);
offset += col_desc[4].max_data_string + 2;
}
if (!col_desc[5].disabled) {
if (!g_cores_stats.cores.core[core_num].core_freq) {
snprintf(core_freq, MAX_CORE_FREQ_STR_LEN, "%s", "N/A");
} else {
snprintf(core_freq, MAX_CORE_FREQ_STR_LEN, "%" PRIu32,
g_cores_stats.cores.core[core_num].core_freq);
}
print_max_len(g_tabs[CORES_TAB], TABS_DATA_START_ROW + item_index, offset,
col_desc[5].max_data_string, ALIGN_RIGHT, core_freq);
} }
store_core_last_stats(cores[core_num].core, cores[core_num].idle, cores[core_num].busy); store_core_last_stats(cores[core_num].core, cores[core_num].idle, cores[core_num].busy);