perf report/top TUI: Fix title line formatting
PATCH 1/1 perf report/top TUI: Fix title line formatting
Acks? :)
---
In d10ec006dcd7 ("perf hists browser: Allow passing an initial hotkey") the hist_entry__title() call was cut'n'pasted to a function where the 'title' variable is a pointer, not an array, so the sizeof(title) continues syntactically valid but ends up reducing the real size of the buffer where to format the first line in the screen to 8 bytes, which makes the formatting at the title at each refresh to produce just the string "Samples ", duh, fix it by passing the size of the buffer.
--- tools/perf/ui/browsers/hists.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/perf/ui/browsers/hists.c +4 -4
@@ -677,7 +677,7 @@ static int hist_browser__title(struct hist_browser *browser, char *bf, size_t sireturn browser->title ? browser->title (browser, bf, size) :0 ; } -static int hist_browser__handle_hotkey (struct hist_browser *browser,bool warn_lost_event,char *title,int key) +static int hist_browser__handle_hotkey (struct hist_browser *browser,bool warn_lost_event,char *title,size_t size,int key) {switch (key) {case K_TIMER : {
@@ -703,7 +703,7 @@ static int hist_browser__handle_hotkey(struct hist_browser *browser, bool warn_lui_browser__warn_lost_events (&browser->b); } -hist_browser__title (browser, title,sizeof (title)); +hist_browser__title (browser, title, size);ui_browser__show_title (&browser->b, title);break ; }
@@ -764,13 +764,13 @@ int hist_browser__run(struct hist_browser *browser, const char *help,if (ui_browser__show (&browser->b, title,"%s" , help) <0 )return -1 ; -if (key &&hist_browser__handle_hotkey (browser, warn_lost_event, title, key)) +if (key &&hist_browser__handle_hotkey (browser, warn_lost_event, title,sizeof (title), key)) goto out;while (1 ) { key =ui_browser__run (&browser->b, delay_secs); -if (hist_browser__handle_hotkey (browser, warn_lost_event, title, key)) +if (hist_browser__handle_hotkey (browser, warn_lost_event, title,sizeof (title), key))break ; } out:
Signature · 1 line
2.25.1
The following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 376c3c22e2ba69d7509aa070f1a7dd88efdb0a9c Gitweb: https://git.kernel.org/tip/376c3c22e2ba69d7509aa070f1a7dd88efdb0a9c Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 30 Mar 2020 12:35:21 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Fri, 03 Apr 2020 09:37:55 -03:00
perf report/top TUI: Fix title line formatting
In d10ec006dcd7 ("perf hists browser: Allow passing an initial hotkey") the hist_entry__title() call was cut'n'pasted to a function where the 'title' variable is a pointer, not an array, so the sizeof(title) continues syntactically valid but ends up reducing the real size of the buffer where to format the first line in the screen to 8 bytes, which makes the formatting at the title at each refresh to produce just the string "Samples ", duh, fix it by passing the size of the buffer.
--- tools/perf/ui/browsers/hists.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/perf/ui/browsers/hists.c +4 -4
@@ -677,7 +677,7 @@ static int hist_browser__title(struct hist_browser *browser, char *bf, size_t sireturn browser->title ? browser->title (browser, bf, size) :0 ; } -static int hist_browser__handle_hotkey (struct hist_browser *browser,bool warn_lost_event,char *title,int key) +static int hist_browser__handle_hotkey (struct hist_browser *browser,bool warn_lost_event,char *title,size_t size,int key) {switch (key) {case K_TIMER : {
@@ -703,7 +703,7 @@ static int hist_browser__handle_hotkey(struct hist_browser *browser, bool warn_lui_browser__warn_lost_events (&browser->b); } -hist_browser__title (browser, title,sizeof (title)); +hist_browser__title (browser, title, size);ui_browser__show_title (&browser->b, title);break ; }
@@ -764,13 +764,13 @@ int hist_browser__run(struct hist_browser *browser, const char *help,if (ui_browser__show (&browser->b, title,"%s" , help) <0 )return -1 ; -if (key &&hist_browser__handle_hotkey (browser, warn_lost_event, title, key)) +if (key &&hist_browser__handle_hotkey (browser, warn_lost_event, title,sizeof (title), key)) goto out;while (1 ) { key =ui_browser__run (&browser->b, delay_secs); -if (hist_browser__handle_hotkey (browser, warn_lost_event, title, key)) +if (hist_browser__handle_hotkey (browser, warn_lost_event, title,sizeof (title), key))break ; } out: