perf probe: Split add_perf_probe_events()
Namhyung Kim
maintainerPATCH 1/3 perf probe: Split add_perf_probe_events()
The add_perf_probe_events() does 3 things:
1. convert all perf events to trace events
2. add all trace events to kernel
3. cleanup all trace events
But sometimes we need to do something with the trace events. So split the funtion into two, so that it can access intermediate trace events via struct __event_package if needed.
--- tools/perf/util/probe-event.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)
tools/perf/util/probe-event.c +26 -4
@@ -2765,9 +2765,10 @@ struct __event_package {int ntevs; }; -int add_perf_probe_events (struct perf_probe_event *pevs,int npevs) +static int __add_perf_probe_events (struct perf_probe_event *pevs,int npevs, +struct __event_package **ppkgs) { -int i, j, ret; +int i, ret;struct __event_package *pkgs; ret =0 ;
@@ -2792,7 +2793,7 @@ int add_perf_probe_events(struct perf_probe_event *pevs, int npevs) ret =convert_to_probe_trace_events (pkgs[i].pev, &pkgs[i].tevs);if (ret <0 ) - goto end; +return ret; pkgs[i].ntevs = ret; }/* This just release blacklist only if allocated */
@@ -2806,7 +2807,19 @@ int add_perf_probe_events(struct perf_probe_event *pevs, int npevs)if (ret <0 )break ; } -end: + + *ppkgs = pkgs; + +return 0 ; +} + +static void cleanup_perf_probe_events (struct __event_package *pkgs,int npevs) +{ +int i, j; + +if (pkgs ==NULL ) +return ; +/* Loop 3: cleanup and free trace events */ for (i =0 ; i < npevs; i++) {for (j =0 ; j < pkgs[i].ntevs; j++)
@@ -2815,6 +2828,15 @@ end: }free (pkgs);exit_symbol_maps (); +} + +int add_perf_probe_events (struct perf_probe_event *pevs,int npevs) +{ +int ret; +struct __event_package *pkgs =NULL ; + + ret =__add_perf_probe_events (pevs, npevs, &pkgs); +cleanup_perf_probe_events (pkgs, npevs);return ret; }
Signature · 1 line
2.5.0
Namhyung Kim
maintainerPATCH 2/3 perf probe: Rename __event_package to probe_event_package
The struct __event_package can be accessed now from other than probe-event.c code. So rename it to more specific name.
--- tools/perf/util/probe-event.c | 18 ++++++------------ tools/perf/util/probe-event.h | 10 ++++++++++ 2 files changed, 16 insertions(+), 12 deletions(-)
tools/perf/util/probe-event.c +6 -12
@@ -2759,20 +2759,14 @@ static int convert_to_probe_trace_events(struct perf_probe_event *pev,return find_probe_trace_events_from_map (pev, tevs); } -struct __event_package { -struct perf_probe_event *pev; -struct probe_trace_event *tevs; -int ntevs; -}; - -static int __add_perf_probe_events (struct perf_probe_event *pevs,int npevs, -struct __event_package **ppkgs) +int __add_perf_probe_events (struct perf_probe_event *pevs,int npevs, +struct probe_event_package **ppkgs) {int i, ret; -struct __event_package *pkgs; +struct probe_event_package *pkgs; ret =0 ; - pkgs =zalloc (sizeof (struct __event_package ) * npevs); + pkgs =zalloc (sizeof (struct probe_event_package ) * npevs);if (pkgs ==NULL )return -ENOMEM ;
@@ -2813,7 +2807,7 @@ static int __add_perf_probe_events(struct perf_probe_event *pevs, int npevs,return 0 ; } -static void cleanup_perf_probe_events (struct __event_package *pkgs,int npevs) +void cleanup_perf_probe_events (struct probe_event_package *pkgs,int npevs) {int i, j;
@@ -2833,7 +2827,7 @@ static void cleanup_perf_probe_events(struct __event_package *pkgs, int npevs)int add_perf_probe_events (struct perf_probe_event *pevs,int npevs) {int ret; -struct __event_package *pkgs =NULL ; +struct probe_event_package *pkgs =NULL ; ret =__add_perf_probe_events (pevs, npevs, &pkgs);cleanup_perf_probe_events (pkgs, npevs);
tools/perf/util/probe-event.h +10 -0
@@ -89,6 +89,12 @@ struct perf_probe_event {struct perf_probe_arg *args;/* Arguments */ }; +struct probe_event_package { +struct perf_probe_event *pev; +struct probe_trace_event *tevs; +int ntevs; +}; +/* Line range */ struct line_range {char *file;/* File name */
@@ -138,6 +144,10 @@ extern void line_range__clear(struct line_range *lr);extern int line_range__init (struct line_range *lr);extern int add_perf_probe_events (struct perf_probe_event *pevs,int npevs); +extern int __add_perf_probe_events (struct perf_probe_event *pevs,int npevs, +struct probe_event_package **ppkgs); +extern void cleanup_perf_probe_events (struct probe_event_package *pkgs, +int npevs);extern int del_perf_probe_events (struct strfilter *filter);extern int show_perf_probe_events (struct strfilter *filter); extern int show_line_range(struct line_range *lr, const char *module,
Signature · 1 line
2.5.0
RE: [RFC/PATCH 2/3] perf probe: Rename __event_package to probe_event_package
Quoted 20 lines
From: Namhyung Kim [mailto:[email protected]] On Behalf Of Namhyung Kim
The struct
__event_packagecan be accessed now from other thanprobe-event.ccode. So rename it to more specific name.Cc Masami Hiramatsu <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/util/probe-event.c | 18 ++++++------------ tools/perf/util/probe-event.h | 10 ++++++++++ 2 files changed, 16 insertions(+), 12 deletions(-)tools/perf/util/probe-event.c +0
-0@@ -2759,20 +2759,14 @@ static int convert_to_probe_trace_events(struct perf_probe_event *pev,return find_probe_trace_events_from_map (pev, tevs); }
tools/perf/util/probe-event.c static int convert_to_probe_trace_events(struct perf_probe_event *pev, · line 2763
Quoted 10 lines
tools/perf/util/probe-event.c +2
-8-struct __event_package { -struct perf_probe_event *pev; -struct probe_trace_event *tevs; -int ntevs; -}; - -static int __add_perf_probe_events (struct perf_probe_event *pevs,int npevs, -struct __event_package **ppkgs) +int __add_perf_probe_events (struct perf_probe_event *pevs,int npevs, +struct probe_event_package **ppkgs)
OK, since now we have probe_event_package object, this function should be refactored as pkgs = probe_event_packages__new(pevs, npevs)(allocate, initialize) , probe_event_packages__convert(pkgs) and probe_event_packages__apply(pkgs).
Quoted 12 lines
tools/perf/util/probe-event.c +2
-2{int i, ret; -struct __event_package *pkgs; +struct probe_event_package *pkgs; ret =0 ; - pkgs =zalloc (sizeof (struct __event_package ) * npevs); + pkgs =zalloc (sizeof (struct probe_event_package ) * npevs);if (pkgs ==NULL )return -ENOMEM ;
tools/perf/util/probe-event.c static int __add_perf_probe_events(struct perf_probe_event *pevs, int npevs, · line 2810
Quoted 5 lines
tools/perf/util/probe-event.c +1
-1@@ -2813,7 +2807,7 @@ static int __add_perf_probe_events(struct perf_probe_event *pevs, int npevs,return 0 ; } -static void cleanup_perf_probe_events (struct __event_package *pkgs,int npevs) +void cleanup_perf_probe_events (struct probe_event_package *pkgs,int npevs)
This also should be perf_event_pacakges__delete() :)
Thanks!
Quoted 41 lines
tools/perf/util/probe-event.c +1
-1{int i, j;@@ -2833,7 +2827,7 @@ static void cleanup_perf_probe_events(struct __event_package *pkgs, int npevs)int add_perf_probe_events (struct perf_probe_event *pevs,int npevs) {int ret; -struct __event_package *pkgs =NULL ; +struct probe_event_package *pkgs =NULL ; ret =__add_perf_probe_events (pevs, npevs, &pkgs);cleanup_perf_probe_events (pkgs, npevs);tools/perf/util/probe-event.h +10
-1@@ -89,6 +89,12 @@ struct perf_probe_event {struct perf_probe_arg *args;/* Arguments */ }; +struct probe_event_package { +struct perf_probe_event *pev; +struct probe_trace_event *tevs; +int ntevs; +}; +/* Line range */ struct line_range {char *file;/* File name */ @@ -138,6 +144,10 @@ extern void line_range__clear(struct line_range *lr);extern int line_range__init (struct line_range *lr);extern int add_perf_probe_events (struct perf_probe_event *pevs,int npevs); +extern int __add_perf_probe_events (struct perf_probe_event *pevs,int npevs, +struct probe_event_package **ppkgs); +extern void cleanup_perf_probe_events (struct probe_event_package *pkgs, +int npevs);extern int del_perf_probe_events (struct strfilter *filter);extern int show_perf_probe_events (struct strfilter *filter); extern int show_line_range(struct line_range *lr, const char *module, --
Quoted 1 line
2.5.0
���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�
Namhyung Kim
maintainerRe: [RFC/PATCH 2/3] perf probe: Rename __event_package to probe_event_package
Quoted 20 lines · 平松雅巳 / HIRAMATU,MASAMI
Quoted 20 lines
From: Namhyung Kim [mailto:[email protected]] On Behalf Of Namhyung Kim
The struct
__event_packagecan be accessed now from other thanprobe-event.ccode. So rename it to more specific name.Cc Masami Hiramatsu <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/util/probe-event.c | 18 ++++++------------ tools/perf/util/probe-event.h | 10 ++++++++++ 2 files changed, 16 insertions(+), 12 deletions(-)tools/perf/util/probe-event.c +0
-0@@ -2759,20 +2759,14 @@ static int convert_to_probe_trace_events(struct perf_probe_event *pev,return find_probe_trace_events_from_map (pev, tevs); }
Quoted 14 lines
tools/perf/util/probe-event.c static int convert_to_probe_trace_events(struct perf_probe_event *pev, · line 2763
Quoted 10 lines
tools/perf/util/probe-event.c +2
-8-struct __event_package { -struct perf_probe_event *pev; -struct probe_trace_event *tevs; -int ntevs; -}; - -static int __add_perf_probe_events (struct perf_probe_event *pevs,int npevs, -struct __event_package **ppkgs) +int __add_perf_probe_events (struct perf_probe_event *pevs,int npevs, +struct probe_event_package **ppkgs)OK, since now we have
probe_event_packageobject, this function should be refactored as pkgs =probe_event_packages__new(pevs, npevs)(allocate, initialize) ,probe_event_packages__convert(pkgs)andprobe_event_packages__apply(pkgs).
I think it'd be better using Wang Nan's patch below.
https://lkml.org/lkml/2015/8/29/25
I'll send v2 with this change.
Thanks,
Namhyung
Quoted 66 lines
Quoted 13 lines
tools/perf/util/probe-event.c +2
-2{int i, ret; -struct __event_package *pkgs; +struct probe_event_package *pkgs; ret =0 ; - pkgs =zalloc (sizeof (struct __event_package ) * npevs); + pkgs =zalloc (sizeof (struct probe_event_package ) * npevs);if (pkgs ==NULL )return -ENOMEM ;tools/perf/util/probe-event.c static int __add_perf_probe_events(struct perf_probe_event *pevs, int npevs, · line 2810
Quoted 5 lines
tools/perf/util/probe-event.c +1
-1@@ -2813,7 +2807,7 @@ static int __add_perf_probe_events(struct perf_probe_event *pevs, int npevs,return 0 ; } -static void cleanup_perf_probe_events (struct __event_package *pkgs,int npevs) +void cleanup_perf_probe_events (struct probe_event_package *pkgs,int npevs)This also should be
perf_event_pacakges__delete():)Thanks!
Quoted 42 lines
tools/perf/util/probe-event.c +1
-1{int i, j;@@ -2833,7 +2827,7 @@ static void cleanup_perf_probe_events(struct __event_package *pkgs, int npevs)int add_perf_probe_events (struct perf_probe_event *pevs,int npevs) {int ret; -struct __event_package *pkgs =NULL ; +struct probe_event_package *pkgs =NULL ; ret =__add_perf_probe_events (pevs, npevs, &pkgs);cleanup_perf_probe_events (pkgs, npevs);tools/perf/util/probe-event.h +10
-1@@ -89,6 +89,12 @@ struct perf_probe_event {struct perf_probe_arg *args;/* Arguments */ }; +struct probe_event_package { +struct perf_probe_event *pev; +struct probe_trace_event *tevs; +int ntevs; +}; +/* Line range */ struct line_range {char *file;/* File name */ @@ -138,6 +144,10 @@ extern void line_range__clear(struct line_range *lr);extern int line_range__init (struct line_range *lr);extern int add_perf_probe_events (struct perf_probe_event *pevs,int npevs); +extern int __add_perf_probe_events (struct perf_probe_event *pevs,int npevs, +struct probe_event_package **ppkgs); +extern void cleanup_perf_probe_events (struct probe_event_package *pkgs, +int npevs);extern int del_perf_probe_events (struct strfilter *filter);extern int show_perf_probe_events (struct strfilter *filter); extern int show_line_range(struct line_range *lr, const char *module, --2.5.0
RE: Re: [RFC/PATCH 2/3] perf probe: Rename __event_package to probe_event_package
Quoted 38 lines
From: Namhyung Kim [mailto:[email protected]] On Behalf Of Namhyung Kim
Quoted 20 lines · 平松雅巳 / HIRAMATU,MASAMI
Quoted 20 lines
From: Namhyung Kim [mailto:[email protected]] On Behalf Of Namhyung Kim
The struct
__event_packagecan be accessed now from other thanprobe-event.ccode. So rename it to more specific name.Cc Masami Hiramatsu <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/util/probe-event.c | 18 ++++++------------ tools/perf/util/probe-event.h | 10 ++++++++++ 2 files changed, 16 insertions(+), 12 deletions(-)tools/perf/util/probe-event.c +0
-0@@ -2759,20 +2759,14 @@ static int convert_to_probe_trace_events(struct perf_probe_event *pev,return find_probe_trace_events_from_map (pev, tevs); }Quoted 14 lines
tools/perf/util/probe-event.c static int convert_to_probe_trace_events(struct perf_probe_event *pev, · line 2763
Quoted 10 lines
tools/perf/util/probe-event.c +2
-8-struct __event_package { -struct perf_probe_event *pev; -struct probe_trace_event *tevs; -int ntevs; -}; - -static int __add_perf_probe_events (struct perf_probe_event *pevs,int npevs, -struct __event_package **ppkgs) +int __add_perf_probe_events (struct perf_probe_event *pevs,int npevs, +struct probe_event_package **ppkgs)OK, since now we have
probe_event_packageobject, this function should be refactored as pkgs =probe_event_packages__new(pevs, npevs)(allocate, initialize) ,probe_event_packages__convert(pkgs)andprobe_event_packages__apply(pkgs).
Quoted 3 lines
I think it'd be better using Wang Nan's patch below.
Ah, I see. It is certainly good way to solve :)
Thanks!
Quoted 73 lines
I'll send v2 with this change.
Thanks,
NamhyungQuoted 66 lines
Quoted 13 lines
tools/perf/util/probe-event.c +2
-2{int i, ret; -struct __event_package *pkgs; +struct probe_event_package *pkgs; ret =0 ; - pkgs =zalloc (sizeof (struct __event_package ) * npevs); + pkgs =zalloc (sizeof (struct probe_event_package ) * npevs);if (pkgs ==NULL )return -ENOMEM ;tools/perf/util/probe-event.c static int __add_perf_probe_events(struct perf_probe_event *pevs, int npevs, · line 2810
Quoted 5 lines
tools/perf/util/probe-event.c +1
-1@@ -2813,7 +2807,7 @@ static int __add_perf_probe_events(struct perf_probe_event *pevs, int npevs,return 0 ; } -static void cleanup_perf_probe_events (struct __event_package *pkgs,int npevs) +void cleanup_perf_probe_events (struct probe_event_package *pkgs,int npevs)This also should be
perf_event_pacakges__delete():)Thanks!
Quoted 42 lines
tools/perf/util/probe-event.c +1
-1{int i, j;@@ -2833,7 +2827,7 @@ static void cleanup_perf_probe_events(struct __event_package *pkgs, int npevs)int add_perf_probe_events (struct perf_probe_event *pevs,int npevs) {int ret; -struct __event_package *pkgs =NULL ; +struct probe_event_package *pkgs =NULL ; ret =__add_perf_probe_events (pevs, npevs, &pkgs);cleanup_perf_probe_events (pkgs, npevs);tools/perf/util/probe-event.h +10
-1@@ -89,6 +89,12 @@ struct perf_probe_event {struct perf_probe_arg *args;/* Arguments */ }; +struct probe_event_package { +struct perf_probe_event *pev; +struct probe_trace_event *tevs; +int ntevs; +}; +/* Line range */ struct line_range {char *file;/* File name */ @@ -138,6 +144,10 @@ extern void line_range__clear(struct line_range *lr);extern int line_range__init (struct line_range *lr);extern int add_perf_probe_events (struct perf_probe_event *pevs,int npevs); +extern int __add_perf_probe_events (struct perf_probe_event *pevs,int npevs, +struct probe_event_package **ppkgs); +extern void cleanup_perf_probe_events (struct probe_event_package *pkgs, +int npevs);extern int del_perf_probe_events (struct strfilter *filter);extern int show_perf_probe_events (struct strfilter *filter); extern int show_line_range(struct line_range *lr, const char *module, --2.5.0
���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�
Namhyung Kim
maintainerPATCH 3/3 perf probe: Move print logic into cmd_probe()
In reply to Namhyung KimShowing actual trace event when adding perf events is only needed in perf probe command. But the add functionality itself can be used by other places. So move the printing code into the cmd_probe().
Also it combines the output if more than one event is added.
Before:
$ sudo perf probe -a do_fork -a do_exit Added new event: probe:do_fork (on do_fork)
You can now use it in all perf tools, such as:
perf record -e probe:do_fork -aR sleep 1
Added new events:
probe:do_exit (on do_exit)
probe:do_exit_1 (on do_exit)
You can now use it in all perf tools, such as:
perf record -e probe:do_exit_1 -aR sleep 1
After:
$ sudo perf probe -a do_fork -a do_exit Added new events: probe:do_fork (on do_fork) probe:do_exit (on do_exit) probe:do_exit_1 (on do_exit)
You can now use it in all perf tools, such as:
perf record -e probe:do_exit_1 -aR sleep 1
--- tools/perf/builtin-probe.c | 39 ++++++++++++++++++++++++++++++++++++++- tools/perf/util/probe-event.c | 22 +++------------------- tools/perf/util/probe-event.h | 3 +++ 3 files changed, 44 insertions(+), 20 deletions(-)
tools/perf/builtin-probe.c +38 -1
@@ -403,6 +403,9 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused) OPT_END() };int ret; +int i, k; +struct probe_event_package *pkgs =NULL ; +const char *event =NULL , *group =NULL ;set_option_flag (options,'a' ,"add" ,PARSE_OPT_EXCLUSIVE );set_option_flag (options,'d' ,"del" ,PARSE_OPT_EXCLUSIVE );
@@ -496,7 +499,41 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused)usage_with_options (probe_usage, options); } - ret =add_perf_probe_events (params.events, params.nevents); + ret =__add_perf_probe_events (params.events, params.nevents, + &pkgs); +if (ret <0 ) + goto out_cleanup; + +for (i = k =0 ; i < params.nevents; i++) + k += pkgs[i].ntevs; + +pr_info ("Added new event%s\n" , (k >1 ) ?"s:" :":" ); +for (i =0 ; i < params.nevents; i++) { +struct perf_probe_event *pev = pkgs[i].pev; + +for (k =0 ; k < pkgs[i].ntevs; k++) { +struct probe_trace_event *tev = &pkgs[i].tevs[k]; + +/* We use tev's name for showing new events */ +show_perf_probe_event (tev->group, tev->event, pev, + tev->point.module, false); + +/* Save the last valid name */ + event = tev->event; + group = tev->group; + } + } + +/* Note that it is possible to skip all events because of blacklist */ +if (event) { +/* Show how to use the event. */ +pr_info ("\nYou can now use it in all perf tools, such as:\n\n" ); +pr_info ("\tperf record -e %s:%s -aR sleep 1\n\n" , group, event); + } + +out_cleanup: +cleanup_perf_probe_events (pkgs, params.nevents); +if (ret <0 ) {pr_err_with_code (" Error: Failed to add events." , ret);return ret;
tools/perf/util/probe-event.c +3 -19
@@ -2180,9 +2180,9 @@ out: }/* Show an event */ -static int show_perf_probe_event (const char *group,const char *event, -struct perf_probe_event *pev, -const char *module,bool use_stdout) +int show_perf_probe_event (const char *group,const char *event, +struct perf_probe_event *pev, +const char *module,bool use_stdout) {struct strbuf buf =STRBUF_INIT ;int ret;
@@ -2399,7 +2399,6 @@ static int __add_probe_trace_events(struct perf_probe_event *pev, {int i, fd, ret;struct probe_trace_event *tev =NULL ; -const char *event =NULL , *group =NULL ;struct strlist *namelist; fd =probe_file__open (PF_FL_RW | (pev->uprobes ?PF_FL_UPROBE :0 ));
@@ -2415,7 +2414,6 @@ static int __add_probe_trace_events(struct perf_probe_event *pev, } ret =0 ; -pr_info ("Added new event%s\n" , (ntevs >1 ) ?"s:" :":" );for (i =0 ; i < ntevs; i++) { tev = &tevs[i];/* Skip if the symbol is out of .text or blacklisted */
@@ -2432,13 +2430,6 @@ static int __add_probe_trace_events(struct perf_probe_event *pev,if (ret <0 )break ; -/* We use tev's name for showing new events */ -show_perf_probe_event (tev->group, tev->event, pev, - tev->point.module, false); -/* Save the last valid name */ - event = tev->event; - group = tev->group; -/* * Probes after the first probe which comes from same * user input are always allowed to add suffix, because
@@ -2450,13 +2441,6 @@ static int __add_probe_trace_events(struct perf_probe_event *pev,if (ret == -EINVAL && pev->uprobes)warn_uprobe_event_compat (tev); -/* Note that it is possible to skip all events because of blacklist */ -if (ret >=0 && event) { -/* Show how to use the event. */ -pr_info ("\nYou can now use it in all perf tools, such as:\n\n" ); -pr_info ("\tperf record -e %s:%s -aR sleep 1\n\n" , group, event); - } -strlist__delete (namelist); close_out:close (fd);
tools/perf/util/probe-event.h +3 -0
@@ -149,6 +149,9 @@ extern int __add_perf_probe_events(struct perf_probe_event *pevs, int npevs,extern void cleanup_perf_probe_events (struct probe_event_package *pkgs,int npevs);extern int del_perf_probe_events (struct strfilter *filter); +extern int show_perf_probe_event (const char *group,const char *event, +struct perf_probe_event *pev, +const char *module,bool use_stdout);extern int show_perf_probe_events (struct strfilter *filter);extern int show_line_range (struct line_range *lr,const char *module,bool user);
Signature · 1 line
2.5.0
RE: [RFC/PATCH 3/3] perf probe: Move print logic into cmd_probe()
Quoted 32 lines
From: Namhyung Kim [mailto:[email protected]] On Behalf Of Namhyung Kim
Showing actual trace event when adding perf events is only needed in perf probe command. But the add functionality itself can be used by other places. So move the printing code into the
cmd_probe().Also it combines the output if more than one event is added.
Before:
$ sudo perf probe -a do_fork -a do_exit Added new event: probe:do_fork (on do_fork)You can now use it in all perf tools, such as:
perf record -e probe:do_fork -aR sleep 1
Added new events:
probe:do_exit (ondo_exit)
probe:do_exit_1 (ondo_exit)You can now use it in all perf tools, such as:
perf record -e probe:do_exit_1 -aR sleep 1
After:
$ sudo perf probe -a do_fork -a do_exit Added new events: probe:do_fork (on do_fork) probe:do_exit (on do_exit) probe:do_exit_1 (on do_exit)
Quoted 4 lines
You can now use it in all perf tools, such as:
perf record -e probe:do_exit_1 -aR sleep 1
This change is good for me :)
And have a comment below,
[...]
Quoted 29 lines
tools/perf/builtin-probe.c +24
-1@@ -496,7 +499,41 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused)usage_with_options (probe_usage, options); } - ret =add_perf_probe_events (params.events, params.nevents); + ret =__add_perf_probe_events (params.events, params.nevents, + &pkgs); +if (ret <0 ) + goto out_cleanup; + +for (i = k =0 ; i < params.nevents; i++) + k += pkgs[i].ntevs; + +pr_info ("Added new event%s\n" , (k >1 ) ?"s:" :":" ); +for (i =0 ; i < params.nevents; i++) { +struct perf_probe_event *pev = pkgs[i].pev; + +for (k =0 ; k < pkgs[i].ntevs; k++) { +struct probe_trace_event *tev = &pkgs[i].tevs[k]; + +/* We use tev's name for showing new events */ +show_perf_probe_event (tev->group, tev->event, pev, + tev->point.module, false); + +/* Save the last valid name */ + event = tev->event; + group = tev->group; + } + }
tools/perf/builtin-probe.c __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused) · line 535
Quoted 10 lines
tools/perf/builtin-probe.c +10
-0+ +/* Note that it is possible to skip all events because of blacklist */ +if (event) { +/* Show how to use the event. */ +pr_info ("\nYou can now use it in all perf tools, such as:\n\n" ); +pr_info ("\tperf record -e %s:%s -aR sleep 1\n\n" , group, event); + } + +out_cleanup: +cleanup_perf_probe_events (pkgs, params.nevents);
I think this should be a separated function to avoid increasing the size of __cmd_probe()
Thanks,
���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�
Quoted 11 lines
From: Namhyung Kim [mailto:[email protected]] On Behalf Of Namhyung Kim
The
add_perf_probe_events()does 3 things:1. convert all perf events to trace events
2. add all trace events to kernel
3. cleanup all trace eventsBut sometimes we need to do something with the trace events. So split the funtion into two, so that it can access intermediate trace events via struct
__event_packageif needed.
Yeah, this is good to me.
Thanks Namhyung!
Quoted 71 lines
Cc Masami Hiramatsu <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/util/probe-event.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)tools/perf/util/probe-event.c +26
-5@@ -2765,9 +2765,10 @@ struct __event_package {int ntevs; }; -int add_perf_probe_events (struct perf_probe_event *pevs,int npevs) +static int __add_perf_probe_events (struct perf_probe_event *pevs,int npevs, +struct __event_package **ppkgs) { -int i, j, ret; +int i, ret;struct __event_package *pkgs; ret =0 ;@@ -2792,7 +2793,7 @@ int add_perf_probe_events(struct perf_probe_event *pevs, int npevs) ret =convert_to_probe_trace_events (pkgs[i].pev, &pkgs[i].tevs);if (ret <0 ) - goto end; +return ret; pkgs[i].ntevs = ret; }/* This just release blacklist only if allocated */ @@ -2806,7 +2807,19 @@ int add_perf_probe_events(struct perf_probe_event *pevs, int npevs)if (ret <0 )break ; } -end: + + *ppkgs = pkgs; + +return 0 ; +} + +static void cleanup_perf_probe_events (struct __event_package *pkgs,int npevs) +{ +int i, j; + +if (pkgs ==NULL ) +return ; +/* Loop 3: cleanup and free trace events */ for (i =0 ; i < npevs; i++) {for (j =0 ; j < pkgs[i].ntevs; j++)@@ -2815,6 +2828,15 @@ end: }free (pkgs);exit_symbol_maps (); +} + +int add_perf_probe_events (struct perf_probe_event *pevs,int npevs) +{ +int ret; +struct __event_package *pkgs =NULL ; + + ret =__add_perf_probe_events (pevs, npevs, &pkgs); +cleanup_perf_probe_events (pkgs, npevs);return ret; } --
Quoted 1 line
2.5.0
���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�