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

spdk_top: fix a bug on minimal size spdk_top window

Browse Source 
Fixes a bug that occurs when spdk_top window is just big enough
to print empty line in data area, but unable to fill the line with
actual data, resulting in application crash.

Signed-off-by: Krzysztof Karas <krzysztof.karas@intel.com>
Change-Id: Id39267a9587b9e0ab74a43f5010927af6faff512
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6216
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>
This commit is contained in:
Krzysztof Karas 2021-02-01 14:30:55 +01:00 committed by Tomasz Zawadzki
parent de21d8f4e4
commit 8f05269572
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/spdk_top/spdk_top.c
View File

@ -2285,6 +2285,7 @@ show_stats(void)
uint8_t active_tab = THREADS_TAB; uint8_t active_tab = THREADS_TAB;
uint8_t current_page = 0; uint8_t current_page = 0;
uint8_t max_pages = 1; uint8_t max_pages = 1;
uint16_t required_size = WINDOW_HEADER + 1;
char current_page_str[CURRENT_PAGE_STR_LEN]; char current_page_str[CURRENT_PAGE_STR_LEN];
bool force_refresh = true; bool force_refresh = true;
@ -2298,9 +2299,9 @@ show_stats(void)
getmaxyx(stdscr, max_row, max_col); getmaxyx(stdscr, max_row, max_col);
if (max_row != g_max_row || max_col != g_max_col) { if (max_row != g_max_row || max_col != g_max_col) {
g_max_row = max_row; g_max_row = spdk_max(max_row, required_size);
g_max_col = max_col; g_max_col = max_col;
g_data_win_size = g_max_row - MENU_WIN_HEIGHT - TAB_WIN_HEIGHT - TABS_DATA_START_ROW; g_data_win_size = g_max_row - required_size + 1;
g_max_data_rows = g_max_row - WINDOW_HEADER; g_max_data_rows = g_max_row - WINDOW_HEADER;
resize_interface(active_tab); resize_interface(active_tab);
} }
@ -2413,9 +2414,11 @@ static void
draw_interface(void) draw_interface(void)
{ {
int i; int i;
uint16_t required_size = WINDOW_HEADER + 1;
getmaxyx(stdscr, g_max_row, g_max_col); getmaxyx(stdscr, g_max_row, g_max_col);
g_data_win_size = g_max_row - MENU_WIN_HEIGHT - TAB_WIN_HEIGHT - TABS_DATA_START_ROW; g_max_row = spdk_max(g_max_row, required_size);
g_data_win_size = g_max_row - required_size;
g_max_data_rows = g_max_row - WINDOW_HEADER; g_max_data_rows = g_max_row - WINDOW_HEADER;
g_menu_win = newwin(MENU_WIN_HEIGHT, g_max_col, g_max_row - MENU_WIN_HEIGHT - 1, g_menu_win = newwin(MENU_WIN_HEIGHT, g_max_col, g_max_row - MENU_WIN_HEIGHT - 1,