perf ui: Introduce non-interactive ui__info_window() function
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 9b01611934c045ac7ca71aebf5ee1906951d6bce Gitweb: https://git.kernel.org/tip/9b01611934c045ac7ca71aebf5ee1906951d6bce Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 19 Aug 2019 16:38:24 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Tue, 20 Aug 2019 12:21:49 -03:00
perf ui: Introduce non-interactive ui__info_window() function
Sometimes we want just to print a message on the center of the screen, like in 'perf top' while we wait for the minimum amount of samples to be collected before sorting and showing them.
Also expose __ui__info_window() as an optimization for cases where such message is to be printed while holding the ui lock.
Cc Adrian Hunter <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/ui/tui/util.c | 23 +++++++++++++++-------- tools/perf/ui/util.h | 2 ++ 2 files changed, 17 insertions(+), 8 deletions(-)
tools/perf/ui/tui/util.c +15 -8
@@ -162,8 +162,7 @@ int ui_browser__input_window(const char *title, const char *text, char *input,return key; } -int ui__question_window (const char *title,const char *text, -const char *exit_msg,int delay_secs) +void __ui__info_window (const char *title,const char *text,const char *exit_msg) {int x, y;int max_len =0 , nr_lines =0 ;
@@ -185,8 +184,6 @@ int ui__question_window(const char *title, const char *text, t = sep +1 ; } -pthread_mutex_lock (&ui__lock); - max_len +=2 ; nr_lines +=2 ;if (exit_msg)
@@ -206,19 +203,29 @@ int ui__question_window(const char *title, const char *text, max_len -=2 ;SLsmg_write_wrapped_string ((unsigned char *)text, y, x, nr_lines, max_len,1 ); -SLsmg_gotorc (y + nr_lines -2 , x); -SLsmg_write_nstring ((char *)" " , max_len); -SLsmg_gotorc (y + nr_lines -1 , x);if (exit_msg) {SLsmg_gotorc (y + nr_lines -2 , x);SLsmg_write_nstring ((char *)" " , max_len);SLsmg_gotorc (y + nr_lines -1 , x);SLsmg_write_nstring ((char *)exit_msg, max_len); } -SLsmg_refresh (); +} +void ui__info_window (const char *title,const char *text) +{ +pthread_mutex_lock (&ui__lock); +__ui__info_window (title, text,NULL ); +SLsmg_refresh ();pthread_mutex_unlock (&ui__lock); +} +int ui__question_window (const char *title,const char *text, +const char *exit_msg,int delay_secs) +{ +pthread_mutex_lock (&ui__lock); +__ui__info_window (title, text, exit_msg); +SLsmg_refresh (); +pthread_mutex_unlock (&ui__lock);return ui__getch (delay_secs); }
tools/perf/ui/util.h +2 -0
@@ -8,6 +8,8 @@ int ui__getch(int delay_secs);int ui__popup_menu (int argc,char *const argv[]);int ui__help_window (const char *text);int ui__dialog_yesno (const char *msg); +void __ui__info_window (const char *title,const char *text,const char *exit_msg); +void ui__info_window (const char *title,const char *text);int ui__question_window (const char *title,const char *text,const char *exit_msg,int delay_secs);