perf hists browser: Add option for runtime switching perf data file
PATCH v2 1/2 perf hists browser: Add option for runtime switching perf data file
Based on perf report/top/scripts browser integration idea from acme.
This will enable user to runtime switch the data file, when this option is selected, it will popup all the legal data files in current working directory, and the filename selected by user is saved in the global variable "input_name", and a new key 'K_SWITCH_INPUT_DATA' will be passed back to the built-in command which will perform the switch.
This initial version only enables it for 'perf report'.
v2: rebase to latest 'perf/core' branch (6e1d4dd) of acme's perf tree
--- tools/perf/ui/browsers/hists.c | 112 +++++++++++++++++++++++++++++++++++++++- tools/perf/ui/keysyms.h | 1 + 2 files changed, 112 insertions(+), 1 deletion(-)
tools/perf/ui/browsers/hists.c +111 -1
@@ -1241,6 +1241,96 @@ static inline bool is_report_browser(void *timer)return timer ==NULL ; } +/* +* Only runtime switching of perf data file will make "input_name" point +* to a malloced buffer. So add "is_input_name_malloced" flag to decide +* whether we need to call free() for current "input_name" during the switch. +*/ +static bool is_input_name_malloced = false; + +static int switch_data_file (void ) +{ +char *pwd, *options[32 ], *abs_path[32 ], *tmp; +DIR *pwd_dir; +int nr_options =0 , choice =-1 , ret =-1 ; +struct dirent *dent; + + pwd =getenv ("PWD" ); +if (!pwd) +return ret; + + pwd_dir =opendir (pwd); +if (!pwd_dir) +return ret; + +memset (options,0 ,sizeof (options)); +memset (options,0 ,sizeof (abs_path)); + +while ((dent =readdir (pwd_dir))) { +char path[PATH_MAX ]; +u64 magic; +char *name = dent->d_name; +FILE *file; + +if (!(dent->d_type ==DT_REG )) +continue ; + +snprintf (path,sizeof (path),"%s/%s" , pwd, name); + + file =fopen (path,"r" ); +if (!file) +continue ; + +if (fread (&magic,1 ,8 , file) <8 ) + goto close_file_and_continue; + +if (is_perf_magic (magic)) { + options[nr_options] =strdup (name); +if (!options[nr_options]) + goto close_file_and_continue; + + abs_path[nr_options] =strdup (path); +if (!abs_path[nr_options]) { +free (options[nr_options]); +ui__warning ("Can't search all data files due to memory shortage.\n" ); +fclose (file); +break ; + } + + nr_options++; + } + +close_file_and_continue: +fclose (file); +if (nr_options >=32 ) { +ui__warning ("Too many perf data files in PWD!\n" +"Only the first 32 files will be listed.\n" ); +break ; + } + } +closedir (pwd_dir); + +if (nr_options) { + choice =ui__popup_menu (nr_options, options); +if (choice < nr_options && choice >=0 ) { + tmp =strdup (abs_path[choice]); +if (tmp) { +if (is_input_name_malloced) +free ((void *)input_name); + input_name = tmp; + is_input_name_malloced = true; + ret =0 ; + }else +ui__warning ("Data switch failed due to memory shortage!\n" ); + } + } + +free_popup_options (options, nr_options); +free_popup_options (abs_path, nr_options); +return ret; +} + + static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, const char *helpline, const char *ev_name, bool left_exits,
@@ -1275,7 +1365,8 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,int choice =0 , annotate =-2 , zoom_dso =-2 , zoom_thread =-2 , annotate_f =-2 , annotate_t =-2 , browse_map =-2 ; -int scripts_comm =-2 , scripts_symbol =-2 , scripts_all =-2 ; +int scripts_comm =-2 , scripts_symbol =-2 , + scripts_all =-2 , switch_data =-2 ; nr_options =0 ;
@@ -1332,6 +1423,10 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,if (is_report_browser (hbt)) goto do_scripts;continue ; +case 's' : +if (is_report_browser (hbt)) + goto do_data_switch; +continue ;case K_F1 :case 'h' : ui_browser__help_window(&browser->b,
@@ -1351,6 +1446,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,"d Zoom into current DSO\n" "t Zoom into current Thread\n" "r Run available scripts('perf report' only)\n" +"s Switch to another data file in PWD ('perf report' only)\n" "P Print histograms to perf.hist.N\n" "V Verbose (DSO names in callchains, etc)");continue ;
@@ -1457,6 +1553,9 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,if (asprintf (&options[nr_options],"Run scripts for all samples" ) >0 ) scripts_all = nr_options++; +if (is_report_browser (hbt) &&asprintf (&options[nr_options], +"Switch to another data file in PWD" ) >0 ) + switch_data = nr_options++; add_exit_option: options[nr_options++] = (char *)"Exit" ; retry_popup_menu:
@@ -1567,6 +1666,16 @@ do_scripts:script_browse (script_opt); } +/* Switch to another data file */ +else if (choice == switch_data) { +do_data_switch: +if (!switch_data_file ()) { + key =K_SWITCH_INPUT_DATA ; +break ; + }else +ui__warning ("Won't switch the data files due to\n" +"no valid data file get selected!\n" ); + } } out_free_stack:pstack__delete (fstack);
@@ -1693,6 +1802,7 @@ browse_hists: "Do you really want to exit?"))continue ;/* Fall thru */ +case K_SWITCH_INPUT_DATA :case 'q' :case CTRL ('c' ): goto out;
tools/perf/ui/keysyms.h +1 -0
@@ -23,5 +23,6 @@#define K_TIMER -1#define K_ERROR -2#define K_RESIZE -3 +#define K_SWITCH_INPUT_DATA -4#endif /* _PERF_KEYSYMS_H_ */
Signature · 1 line
1.7.9.5
PATCH v2 2/2 perf report: Enable the runtime switching of perf data file
This is for tui browser only. This patch will check the returned key of tui hists browser, if it's K_SWITH_INPUT_DATA, then recreate a session for the new selected data file.
V2: Move the setup_brower() before the "repeat" jump point.
--- tools/perf/builtin-report.c | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-)
tools/perf/builtin-report.c +27 -11
@@ -468,9 +468,17 @@ static int __cmd_report(struct perf_report *rep)if (use_browser >0 ) {if (use_browser ==1 ) { -perf_evlist__tui_browse_hists (session->evlist, help, -NULL , - &session->header.env); + ret =perf_evlist__tui_browse_hists (session->evlist, + help, +NULL , + &session->header.env); +/* +* Usually "ret" is the last pressed key, and we only +* care if the key notifies us to switch data file. +*/ +if (ret !=K_SWITCH_INPUT_DATA ) + ret =0 ; + }else if (use_browser ==2 ) {perf_evlist__gtk_browse_hists (session->evlist, help,NULL );
@@ -708,6 +716,16 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused)else input_name ="perf.data" ; } + +if (strcmp (input_name,"-" ) !=0 ) +setup_browser (true); +else { + use_browser =0 ; +perf_hpp__column_enable (PERF_HPP__OVERHEAD ); +perf_hpp__init (); + } + +repeat: session =perf_session__new (input_name,O_RDONLY , report.force, false, &report.tool);if (session ==NULL )
@@ -733,14 +751,6 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) } -if (strcmp (input_name,"-" ) !=0 ) -setup_browser (true); -else { - use_browser =0 ; -perf_hpp__column_enable (PERF_HPP__OVERHEAD ); -perf_hpp__init (); - } -setup_sorting (report_usage, options);/*
@@ -809,6 +819,12 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) } ret =__cmd_report (&report); +if (ret ==K_SWITCH_INPUT_DATA ) { +perf_session__delete (session); + goto repeat; + }else + ret =0 ; + error:perf_session__delete (session);return ret;
Signature · 1 line
1.7.9.5
[tip:perf/core] perf report: Enable the runtime switching of perf data file
Commit-ID: ad0de0971b7f7097bd9be1ab4ad2a64db500adbf Gitweb: http://git.kernel.org/tip/ad0de0971b7f7097bd9be1ab4ad2a64db500adbf Author: Feng Tang <[email protected]> AuthorDate: Sun, 3 Feb 2013 14:38:21 +0800 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 6 Feb 2013 18:09:25 -0300
perf report: Enable the runtime switching of perf data file
This is for tui browser only. This patch will check the returned key of tui hists browser, if it's K_SWITH_INPUT_DATA, then recreate a session for the new selected data file.
V2: Move the setup_brower() before the "repeat" jump point.
--- tools/perf/builtin-report.c | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-)
tools/perf/builtin-report.c +27 -11
@@ -468,9 +468,17 @@ static int __cmd_report(struct perf_report *rep)if (use_browser >0 ) {if (use_browser ==1 ) { -perf_evlist__tui_browse_hists (session->evlist, help, -NULL , - &session->header.env); + ret =perf_evlist__tui_browse_hists (session->evlist, + help, +NULL , + &session->header.env); +/* +* Usually "ret" is the last pressed key, and we only +* care if the key notifies us to switch data file. +*/ +if (ret !=K_SWITCH_INPUT_DATA ) + ret =0 ; + }else if (use_browser ==2 ) {perf_evlist__gtk_browse_hists (session->evlist, help,NULL );
@@ -708,6 +716,16 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused)else input_name ="perf.data" ; } + +if (strcmp (input_name,"-" ) !=0 ) +setup_browser (true); +else { + use_browser =0 ; +perf_hpp__column_enable (PERF_HPP__OVERHEAD ); +perf_hpp__init (); + } + +repeat: session =perf_session__new (input_name,O_RDONLY , report.force, false, &report.tool);if (session ==NULL )
@@ -733,14 +751,6 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) } -if (strcmp (input_name,"-" ) !=0 ) -setup_browser (true); -else { - use_browser =0 ; -perf_hpp__column_enable (PERF_HPP__OVERHEAD ); -perf_hpp__init (); - } -setup_sorting (report_usage, options);/*
@@ -809,6 +819,12 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) } ret =__cmd_report (&report); +if (ret ==K_SWITCH_INPUT_DATA ) { +perf_session__delete (session); + goto repeat; + }else + ret =0 ; + error:perf_session__delete (session);return ret;
Commit-ID: 341487ab561f3937a5283dd77c5660b1ee3b1f9e Gitweb: http://git.kernel.org/tip/341487ab561f3937a5283dd77c5660b1ee3b1f9e Author: Feng Tang <[email protected]> AuthorDate: Sun, 3 Feb 2013 14:38:20 +0800 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 6 Feb 2013 18:09:24 -0300
perf hists browser: Add option for runtime switching perf data file
Based on perf report/top/scripts browser integration idea from acme.
This will enable user to runtime switch the data file, when this option is selected, it will popup all the legal data files in current working directory, and the filename selected by user is saved in the global variable "input_name", and a new key 'K_SWITCH_INPUT_DATA' will be passed back to the built-in command which will perform the switch.
This initial version only enables it for 'perf report'.
v2: rebase to latest 'perf/core' branch (6e1d4dd) of acme's perf tree
--- tools/perf/ui/browsers/hists.c | 112 ++++++++++++++++++++++++++++++++++++++++- tools/perf/ui/keysyms.h | 1 + 2 files changed, 112 insertions(+), 1 deletion(-)
tools/perf/ui/browsers/hists.c +111 -1
@@ -1241,6 +1241,96 @@ static inline bool is_report_browser(void *timer)return timer ==NULL ; } +/* +* Only runtime switching of perf data file will make "input_name" point +* to a malloced buffer. So add "is_input_name_malloced" flag to decide +* whether we need to call free() for current "input_name" during the switch. +*/ +static bool is_input_name_malloced = false; + +static int switch_data_file (void ) +{ +char *pwd, *options[32 ], *abs_path[32 ], *tmp; +DIR *pwd_dir; +int nr_options =0 , choice =-1 , ret =-1 ; +struct dirent *dent; + + pwd =getenv ("PWD" ); +if (!pwd) +return ret; + + pwd_dir =opendir (pwd); +if (!pwd_dir) +return ret; + +memset (options,0 ,sizeof (options)); +memset (options,0 ,sizeof (abs_path)); + +while ((dent =readdir (pwd_dir))) { +char path[PATH_MAX ]; +u64 magic; +char *name = dent->d_name; +FILE *file; + +if (!(dent->d_type ==DT_REG )) +continue ; + +snprintf (path,sizeof (path),"%s/%s" , pwd, name); + + file =fopen (path,"r" ); +if (!file) +continue ; + +if (fread (&magic,1 ,8 , file) <8 ) + goto close_file_and_continue; + +if (is_perf_magic (magic)) { + options[nr_options] =strdup (name); +if (!options[nr_options]) + goto close_file_and_continue; + + abs_path[nr_options] =strdup (path); +if (!abs_path[nr_options]) { +free (options[nr_options]); +ui__warning ("Can't search all data files due to memory shortage.\n" ); +fclose (file); +break ; + } + + nr_options++; + } + +close_file_and_continue: +fclose (file); +if (nr_options >=32 ) { +ui__warning ("Too many perf data files in PWD!\n" +"Only the first 32 files will be listed.\n" ); +break ; + } + } +closedir (pwd_dir); + +if (nr_options) { + choice =ui__popup_menu (nr_options, options); +if (choice < nr_options && choice >=0 ) { + tmp =strdup (abs_path[choice]); +if (tmp) { +if (is_input_name_malloced) +free ((void *)input_name); + input_name = tmp; + is_input_name_malloced = true; + ret =0 ; + }else +ui__warning ("Data switch failed due to memory shortage!\n" ); + } + } + +free_popup_options (options, nr_options); +free_popup_options (abs_path, nr_options); +return ret; +} + + static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, const char *helpline, const char *ev_name, bool left_exits,
@@ -1275,7 +1365,8 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,int choice =0 , annotate =-2 , zoom_dso =-2 , zoom_thread =-2 , annotate_f =-2 , annotate_t =-2 , browse_map =-2 ; -int scripts_comm =-2 , scripts_symbol =-2 , scripts_all =-2 ; +int scripts_comm =-2 , scripts_symbol =-2 , + scripts_all =-2 , switch_data =-2 ; nr_options =0 ;
@@ -1332,6 +1423,10 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,if (is_report_browser (hbt)) goto do_scripts;continue ; +case 's' : +if (is_report_browser (hbt)) + goto do_data_switch; +continue ;case K_F1 :case 'h' :case '?' :
@@ -1351,6 +1446,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,"d Zoom into current DSO\n" "t Zoom into current Thread\n" "r Run available scripts('perf report' only)\n" +"s Switch to another data file in PWD ('perf report' only)\n" "P Print histograms to perf.hist.N\n" "V Verbose (DSO names in callchains, etc)\n" "/ Filter symbol by name");
@@ -1458,6 +1554,9 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,if (asprintf (&options[nr_options],"Run scripts for all samples" ) >0 ) scripts_all = nr_options++; +if (is_report_browser (hbt) &&asprintf (&options[nr_options], +"Switch to another data file in PWD" ) >0 ) + switch_data = nr_options++; add_exit_option: options[nr_options++] = (char *)"Exit" ; retry_popup_menu:
@@ -1568,6 +1667,16 @@ do_scripts:script_browse (script_opt); } +/* Switch to another data file */ +else if (choice == switch_data) { +do_data_switch: +if (!switch_data_file ()) { + key =K_SWITCH_INPUT_DATA ; +break ; + }else +ui__warning ("Won't switch the data files due to\n" +"no valid data file get selected!\n" ); + } } out_free_stack:pstack__delete (fstack);
@@ -1694,6 +1803,7 @@ browse_hists: "Do you really want to exit?"))continue ;/* Fall thru */ +case K_SWITCH_INPUT_DATA :case 'q' :case CTRL ('c' ): goto out;
tools/perf/ui/keysyms.h +1 -0
@@ -23,5 +23,6 @@#define K_TIMER -1#define K_ERROR -2#define K_RESIZE -3 +#define K_SWITCH_INPUT_DATA -4#endif /* _PERF_KEYSYMS_H_ */