| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20121120151644.GB14928@infradead.org>
Date: Tue, 20 Nov 2012 12:16:44 -0300
From: Arnaldo Carvalho de Melo <acme@...hat.com>
To: Feng Tang <feng.tang@...el.com>
Cc: Peter Zijlstra <peterz@...radead.org>, Ingo Molnar <mingo@...e.hu>,
Namhyung Kim <namhyung@...nel.org>,
Andi Kleen <andi@...stfloor.org>, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 2/3] perf hists browser: Add option for runtime switching
perf data file
Em Tue, Nov 20, 2012 at 05:31:16PM +0800, Feng Tang escreveu:
> 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'.
>
> Signed-off-by: Feng Tang <feng.tang@...el.com>
> ---
> tools/perf/ui/browsers/hists.c | 113 +++++++++++++++++++++++++++++++++++++++-
> tools/perf/ui/keysyms.h | 1 +
> 2 files changed, 113 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
> index ccc4bd1..c64254b 100644
> --- a/tools/perf/ui/browsers/hists.c
> +++ b/tools/perf/ui/browsers/hists.c
> @@ -1135,6 +1135,97 @@ 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;
> +
no need for this empty line
> + 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, PATH_MAX, "%s/%s", pwd, name);
sizeof(path)
> +
> + 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,
> @@ -1169,7 +1260,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;
>
> @@ -1226,6 +1318,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 '?':
> @@ -1245,6 +1341,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");
> @@ -1352,6 +1449,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:
> @@ -1462,6 +1562,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);
> @@ -1578,6 +1688,7 @@ browse_hists:
> "Do you really want to exit?"))
> continue;
> /* Fall thru */
> + case K_SWITCH_INPUT_DATA:
> case 'q':
> case CTRL('c'):
> goto out;
> diff --git a/tools/perf/ui/keysyms.h b/tools/perf/ui/keysyms.h
> index 809eca5..65092d5 100644
> --- a/tools/perf/ui/keysyms.h
> +++ b/tools/perf/ui/keysyms.h
> @@ -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_ */
> --
> 1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists