On Thu, May 31, 2018 at 12:43:50PM +0300, Alexey Budankov wrote:
>
> Enable complex event names containing [.:=,] symbols to be encoded into Perf
> trace using name= modifier e.g. like this:
>
> perf record -e
> cpu/name=\'OFFCORE_RESPONSE:request=DEMAND_RFO:response=L3_HIT.SNOOP_HITM\',\
> period=0x3567e0,event=0x3c,cmask=0x1/Duk ./futex
>
> Below is how it looks like in the report output. Please note explicit escaped
> quoting at cmdline string in the header so that thestring can be directly
> reused
> for another collection in shell:
>
> perf report --header
>
> # ========
> ...
> # cmdline : /root/abudanko/kernel/tip/tools/perf/perf record -v -e
> cpu/name=\'OFFCORE_RESPONSE:request=DEMAND_RFO:response=L3_HIT.SNOOP_HITM\',period=0x3567e0,event=0x3c,cmask=0x1/Duk
> ./futex
> # event : name =
> OFFCORE_RESPONSE:request=DEMAND_RFO:response=L3_HIT.SNOOP_HITM, , type = 4,
> size = 112, config = 0x100003c, { sample_period, sample_freq } = 3500000,
> sample_type = IP|TID|TIME, disabled = 1, inh
nice ;-)
> ...
> # ========
> #
> #
> # Total Lost Samples: 0
> #
> # Samples: 24K of event
> 'OFFCORE_RESPONSE:request=DEMAND_RFO:response=L3_HIT.SNOOP_HITM'
> # Event count (approx.): 86492000000
> #
> # Overhead Command Shared Object Symbol
>
> # ........ ....... ................
> ..............................................
> #
> 14.75% futex [kernel.vmlinux] [k] __entry_trampoline_start
> ...
>
> Signed-off-by: Alexey Budankov <[email protected]>
> ---
> tools/perf/util/header.c | 19 +++++++++++++++++--
> tools/perf/util/parse-events.l | 8 +++++++-
> 2 files changed, 24 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
> index a8bff2178fbc..e78700385a24 100644
> --- a/tools/perf/util/header.c
> +++ b/tools/perf/util/header.c
> @@ -1459,8 +1459,23 @@ static void print_cmdline(struct feat_fd *ff, FILE *fp)
>
> fprintf(fp, "# cmdline : ");
>
> - for (i = 0; i < nr; i++)
> - fprintf(fp, "%s ", ff->ph->env.cmdline_argv[i]);
> + for (i = 0; i < nr; i++) {
> + char *argv_i = strdup(ff->ph->env.cmdline_argv[i]);
> + if (!argv_i) {
> + fprintf(fp, "%s ", ff->ph->env.cmdline_argv[i]);
> + } else {
> + char *mem = argv_i;
> + do {
> + char *quote = strchr(argv_i, '\'');
> + if (!quote) break;
please put break on separate line
> + *quote++ = '\0';
> + fprintf(fp, "%s\\\'", argv_i);
> + argv_i = quote;
> + } while (1);
> + fprintf(fp, "%s ", argv_i);
> + free(mem);
> + }
> + }
> fputc('\n', fp);
> }
>
> diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l
> index a1a01b1ac8b8..26c28faa0f62 100644
> --- a/tools/perf/util/parse-events.l
> +++ b/tools/perf/util/parse-events.l
> @@ -53,7 +53,11 @@ static int str(yyscan_t scanner, int token)
> YYSTYPE *yylval = parse_events_get_lval(scanner);
> char *text = parse_events_get_text(scanner);
>
> - yylval->str = strdup(text);
> + if (text[0] != '\'')
> + yylval->str = strdup(text);
> + else
> + yylval->str = strndup(&text[1], strlen(text) - 2);
could you please put in some comment exaplining that when
there's \' in the begining there must be one at the end
thanks,
jirka
