Commit 3c701ad9 authored by Richael Zhuang's avatar Richael Zhuang Committed by Jim Harris
Browse files

spdk_top: display the info of in_interrupt 



Add information of in_interrupt of reactor in spdk_top.

Change-Id: Ie461c2ddfb0e6b13fa37485980d16fb2a2fdf941
Signed-off-by: default avatarRichael Zhuang <richael.zhuang@arm.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7911


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarXiaodong Liu <xiaodong.liu@intel.com>
parent 9b137280

app/spdk_top/spdk_top.c

+21 −5
Original line number Diff line number Diff line
@@ -88,10 +88,11 @@ 
#define MAX_TIME_STR_LEN 12

#define MAX_POLLER_RUN_COUNT 20

#define MAX_PERIOD_STR_LEN 12

#define MAX_INTR_LEN 6

#define WINDOW_HEADER 12

#define FROM_HEX 16

#define THREAD_WIN_WIDTH 69

#define THREAD_WIN_HEIGHT 9

#define THREAD_WIN_HEIGHT 10

#define THREAD_WIN_FIRST_COL 2

#define CORE_WIN_FIRST_COL 16

#define CORE_WIN_WIDTH 48
@@ -174,6 +175,7 @@ static struct col_desc g_col_desc[NUMBER_OF_TABS][TABS_COL_COUNT] = { 
		{.name = "Idle [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 = "Intr", .max_data_string = MAX_INTR_LEN},

		{.name = (char *)NULL}

	}

};
@@ -223,6 +225,7 @@ struct rpc_core_info { 
	uint32_t core_freq;

	uint64_t last_idle;

	uint64_t last_busy;

	bool in_interrupt;

	struct rpc_core_threads threads;

};
@@ -473,6 +476,7 @@ static const struct spdk_json_object_decoder rpc_core_info_decoders[] = { 
	{"busy", offsetof(struct rpc_core_info, busy), 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, true},

	{"in_interrupt", offsetof(struct rpc_core_info, in_interrupt), spdk_json_decode_bool},

	{"lw_threads", offsetof(struct rpc_core_info, threads), rpc_decode_cores_lw_threads},

};
@@ -1355,7 +1359,8 @@ refresh_cores_tab(uint8_t current_page) 
	uint8_t max_pages, item_index;

	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], core_freq[MAX_CORE_FREQ_STR_LEN];

	     busy_time[MAX_TIME_STR_LEN], core_freq[MAX_CORE_FREQ_STR_LEN],

	     in_interrupt[MAX_INTR_LEN];



	count = g_last_cores_count;
@@ -1423,6 +1428,13 @@ refresh_cores_tab(uint8_t current_page) 
			}

			print_max_len(g_tabs[CORES_TAB], TABS_DATA_START_ROW + item_index, offset,

				      col_desc[5].max_data_string, ALIGN_RIGHT, core_freq);

			offset += col_desc[5].max_data_string + 2;

		}



		if (!col_desc[6].disabled) {

			snprintf(in_interrupt, MAX_INTR_LEN, "%s", g_cores_info[i].in_interrupt ? "Yes" : "No");

			print_max_len(g_tabs[CORES_TAB], TABS_DATA_START_ROW + item_index,

				      offset + (col_desc[6].name_len / 2), col_desc[6].max_data_string, ALIGN_LEFT, in_interrupt);

		}



		if (item_index == g_selected_row) {
@@ -2085,14 +2097,18 @@ show_core(uint8_t current_page) 
	mvwaddch(core_win, -1, 0, ACS_LTEE);

	mvwhline(core_win, 2, 1, ACS_HLINE, CORE_WIN_WIDTH - 2);

	mvwaddch(core_win, 2, CORE_WIN_WIDTH, ACS_RTEE);

	print_in_middle(core_win, 3, 0, CORE_WIN_WIDTH - (CORE_WIN_WIDTH / 3), "Frequency:", COLOR_PAIR(5));

	print_left(core_win, 3, 1, CORE_WIN_WIDTH - (CORE_WIN_WIDTH / 3),

		   "Frequency:             Intr:", COLOR_PAIR(5));

	if (core_info->core_freq) {

		mvwprintw(core_win, 3, CORE_WIN_FIRST_COL + 15, "%" PRIu32,

		mvwprintw(core_win, 3, CORE_WIN_FIRST_COL - 3, "%" PRIu32,

			  core_info->core_freq);

	} else {

		mvwprintw(core_win, 3, CORE_WIN_FIRST_COL + 15, "%s", "N/A");

		mvwprintw(core_win, 3, CORE_WIN_FIRST_COL - 3, "%s", "N/A");

	}



	mvwprintw(core_win, 3, CORE_WIN_FIRST_COL + 15, "%s",

		  core_info->in_interrupt ? "Yes" : "No");



	mvwaddch(core_win, -1, 0, ACS_LTEE);

	mvwhline(core_win, 4, 1, ACS_HLINE, CORE_WIN_WIDTH - 2);

	mvwaddch(core_win, 4, CORE_WIN_WIDTH, ACS_RTEE);

doc/spdk_top.md

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ The cores tab provides insights into how the application is using the CPU cores 
* Thread count - number of threads currently running on core.

* Poller count - total number of pollers running on core.

* Idle/Busy - how many microseconds core was idle (including time when core ran pollers but did not find any work) or doing actual work.

* Intr - whether this core is in interrupt mode or not.



\n

Pressing ENTER key makes a pop-up window appear, showing above information, along with a list of threads running on selected core. Cores details