perf inject: Make --strip keep evsels
Adrian Hunter
reviewerPATCH 1/1 perf inject: Make --strip keep evsels
create_gcov (refer to the autofdo example in tools/perf/Documentation/intel-pt.txt) now needs the evsels to read the perf.data file. So don't strip them.
--- tools/perf/builtin-inject.c | 54 ------------------------------------- 1 file changed, 54 deletions(-)
tools/perf/builtin-inject.c +0 -54
@@ -578,58 +578,6 @@ static void strip_init(struct perf_inject *inject) evsel->handler = drop_sample; } -static bool has_tracking (struct evsel *evsel) -{ -return evsel->core.attr.mmap || evsel->core.attr.mmap2 || evsel->core.attr.comm || - evsel->core.attr.task; -} - -#define COMPAT_MASK (PERF_SAMPLE_ID | PERF_SAMPLE_TID | PERF_SAMPLE_TIME | \ - PERF_SAMPLE_ID | PERF_SAMPLE_CPU | PERF_SAMPLE_IDENTIFIER) - -/* -* In order that the perf.data file is parsable, tracking events like MMAP need -* their selected event to exist, except if there is only 1 selected event left -* and it has a compatible sample type. -*/ -static bool ok_to_remove (struct evlist *evlist, -struct evsel *evsel_to_remove) -{ -struct evsel *evsel; -int cnt =0 ; -bool ok = false; - -if (!has_tracking (evsel_to_remove)) -return true; - -evlist__for_each_entry (evlist, evsel) { -if (evsel->handler != drop_sample) { - cnt +=1 ; -if ((evsel->core.attr.sample_type &COMPAT_MASK ) == - (evsel_to_remove->core.attr.sample_type &COMPAT_MASK )) - ok = true; - } - } - -return ok && cnt ==1 ; -} - -static void strip_fini (struct perf_inject *inject) -{ -struct evlist *evlist = inject->session->evlist; -struct evsel *evsel, *tmp; - -/* Remove non-synthesized evsels if possible */ -evlist__for_each_entry_safe (evlist, tmp, evsel) { -if (evsel->handler == drop_sample && -ok_to_remove (evlist, evsel)) { -pr_debug ("Deleting %s\n" ,perf_evsel__name (evsel)); -evlist__remove (evlist, evsel); -evsel__delete (evsel); - } - } -} -static int __cmd_inject (struct perf_inject *inject) {int ret = -EINVAL ;
@@ -729,8 +677,6 @@ static int __cmd_inject(struct perf_inject *inject)evlist__remove (session->evlist, evsel);evsel__delete (evsel); } -if (inject->strip) -strip_fini (inject); } session->header.data_offset = output_data_offset; session->header.data_size = inject->bytes_written;
Signature · 1 line
2.17.1
Quoted 8 lines · Adrian Hunter
create_gcov(refer to the autofdo example intools/perf/Documentation/intel-pt.txt) now needs the evsels to read the perf.data file. So don't strip them.Signed-off-by Adrian Hunter <[email protected]>--- tools/perf/builtin-inject.c | 54 ------------------------------------- 1 file changed, 54 deletions(-)
good stats ;-)
thanks,
jirka
Quoted 76 lines
tools/perf/builtin-inject.c +0
-54@@ -578,58 +578,6 @@ static void strip_init(struct perf_inject *inject) evsel->handler = drop_sample; } -static bool has_tracking (struct evsel *evsel) -{ -return evsel->core.attr.mmap || evsel->core.attr.mmap2 || evsel->core.attr.comm || - evsel->core.attr.task; -} - -#define COMPAT_MASK (PERF_SAMPLE_ID | PERF_SAMPLE_TID | PERF_SAMPLE_TIME | \ - PERF_SAMPLE_ID | PERF_SAMPLE_CPU | PERF_SAMPLE_IDENTIFIER) - -/* -* In order that the perf.data file is parsable, tracking events like MMAP need -* their selected event to exist, except if there is only 1 selected event left -* and it has a compatible sample type. -*/ -static bool ok_to_remove (struct evlist *evlist, -struct evsel *evsel_to_remove) -{ -struct evsel *evsel; -int cnt =0 ; -bool ok = false; - -if (!has_tracking (evsel_to_remove)) -return true; - -evlist__for_each_entry (evlist, evsel) { -if (evsel->handler != drop_sample) { - cnt +=1 ; -if ((evsel->core.attr.sample_type &COMPAT_MASK ) == - (evsel_to_remove->core.attr.sample_type &COMPAT_MASK )) - ok = true; - } - } - -return ok && cnt ==1 ; -} - -static void strip_fini (struct perf_inject *inject) -{ -struct evlist *evlist = inject->session->evlist; -struct evsel *evsel, *tmp; - -/* Remove non-synthesized evsels if possible */ -evlist__for_each_entry_safe (evlist, tmp, evsel) { -if (evsel->handler == drop_sample && -ok_to_remove (evlist, evsel)) { -pr_debug ("Deleting %s\n" ,perf_evsel__name (evsel)); -evlist__remove (evlist, evsel); -evsel__delete (evsel); - } - } -} -static int __cmd_inject (struct perf_inject *inject) {int ret = -EINVAL ;@@ -729,8 +677,6 @@ static int __cmd_inject(struct perf_inject *inject)evlist__remove (session->evlist, evsel);evsel__delete (evsel); } -if (inject->strip) -strip_fini (inject); } session->header.data_offset = output_data_offset; session->header.data_size = inject->bytes_written;Signature · 1 line
2.17.1
Arnaldo Carvalho de Melo
AppliedEm Wed, Nov 06, 2019 at 12:03:52PM +0100, Jiri Olsa escreveu:
Quoted 11 lines · Adrian Hunter
Quoted 8 lines
create_gcov(refer to the autofdo example intools/perf/Documentation/intel-pt.txt) now needs the evsels to read the perf.data file. So don't strip them.Signed-off-by Adrian Hunter <[email protected]>--- tools/perf/builtin-inject.c | 54 ------------------------------------- 1 file changed, 54 deletions(-)good stats ;-)
:-)
Quoted 1 line
Acked-by Jiri Olsa <[email protected]>
thanks, applied.
Quoted 79 lines
thanks,
jirkaQuoted 76 lines
tools/perf/builtin-inject.c +0
-54@@ -578,58 +578,6 @@ static void strip_init(struct perf_inject *inject) evsel->handler = drop_sample; } -static bool has_tracking (struct evsel *evsel) -{ -return evsel->core.attr.mmap || evsel->core.attr.mmap2 || evsel->core.attr.comm || - evsel->core.attr.task; -} - -#define COMPAT_MASK (PERF_SAMPLE_ID | PERF_SAMPLE_TID | PERF_SAMPLE_TIME | \ - PERF_SAMPLE_ID | PERF_SAMPLE_CPU | PERF_SAMPLE_IDENTIFIER) - -/* -* In order that the perf.data file is parsable, tracking events like MMAP need -* their selected event to exist, except if there is only 1 selected event left -* and it has a compatible sample type. -*/ -static bool ok_to_remove (struct evlist *evlist, -struct evsel *evsel_to_remove) -{ -struct evsel *evsel; -int cnt =0 ; -bool ok = false; - -if (!has_tracking (evsel_to_remove)) -return true; - -evlist__for_each_entry (evlist, evsel) { -if (evsel->handler != drop_sample) { - cnt +=1 ; -if ((evsel->core.attr.sample_type &COMPAT_MASK ) == - (evsel_to_remove->core.attr.sample_type &COMPAT_MASK )) - ok = true; - } - } - -return ok && cnt ==1 ; -} - -static void strip_fini (struct perf_inject *inject) -{ -struct evlist *evlist = inject->session->evlist; -struct evsel *evsel, *tmp; - -/* Remove non-synthesized evsels if possible */ -evlist__for_each_entry_safe (evlist, tmp, evsel) { -if (evsel->handler == drop_sample && -ok_to_remove (evlist, evsel)) { -pr_debug ("Deleting %s\n" ,perf_evsel__name (evsel)); -evlist__remove (evlist, evsel); -evsel__delete (evsel); - } - } -} -static int __cmd_inject (struct perf_inject *inject) {int ret = -EINVAL ;@@ -729,8 +677,6 @@ static int __cmd_inject(struct perf_inject *inject)evlist__remove (session->evlist, evsel);evsel__delete (evsel); } -if (inject->strip) -strip_fini (inject); } session->header.data_offset = output_data_offset; session->header.data_size = inject->bytes_written;Signature · 1 line
2.17.1
Signature · 1 line
- Arnaldo
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: ef5502a1d9bd042dcf457378a6ac96701e498b1b Gitweb: https://git.kernel.org/tip/ef5502a1d9bd042dcf457378a6ac96701e498b1b Author: Adrian Hunter <[email protected]> AuthorDate: Tue, 05 Nov 2019 12:00:57 +02:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Wed, 06 Nov 2019 15:49:40 -03:00
perf inject: Make --strip keep evsels
create_gcov (refer to the autofdo example in tools/perf/Documentation/intel-pt.txt) now needs the evsels to read the perf.data file. So don't strip them.
--- tools/perf/builtin-inject.c | 54 +------------------------------------ 1 file changed, 54 deletions(-)
tools/perf/builtin-inject.c +0 -54
@@ -578,58 +578,6 @@ static void strip_init(struct perf_inject *inject) evsel->handler = drop_sample; } -static bool has_tracking (struct evsel *evsel) -{ -return evsel->core.attr.mmap || evsel->core.attr.mmap2 || evsel->core.attr.comm || - evsel->core.attr.task; -} - -#define COMPAT_MASK (PERF_SAMPLE_ID | PERF_SAMPLE_TID | PERF_SAMPLE_TIME | \ - PERF_SAMPLE_ID | PERF_SAMPLE_CPU | PERF_SAMPLE_IDENTIFIER) - -/* -* In order that the perf.data file is parsable, tracking events like MMAP need -* their selected event to exist, except if there is only 1 selected event left -* and it has a compatible sample type. -*/ -static bool ok_to_remove (struct evlist *evlist, -struct evsel *evsel_to_remove) -{ -struct evsel *evsel; -int cnt =0 ; -bool ok = false; - -if (!has_tracking (evsel_to_remove)) -return true; - -evlist__for_each_entry (evlist, evsel) { -if (evsel->handler != drop_sample) { - cnt +=1 ; -if ((evsel->core.attr.sample_type &COMPAT_MASK ) == - (evsel_to_remove->core.attr.sample_type &COMPAT_MASK )) - ok = true; - } - } - -return ok && cnt ==1 ; -} - -static void strip_fini (struct perf_inject *inject) -{ -struct evlist *evlist = inject->session->evlist; -struct evsel *evsel, *tmp; - -/* Remove non-synthesized evsels if possible */ -evlist__for_each_entry_safe (evlist, tmp, evsel) { -if (evsel->handler == drop_sample && -ok_to_remove (evlist, evsel)) { -pr_debug ("Deleting %s\n" ,perf_evsel__name (evsel)); -evlist__remove (evlist, evsel); -evsel__delete (evsel); - } - } -} -static int __cmd_inject (struct perf_inject *inject) {int ret = -EINVAL ;
@@ -729,8 +677,6 @@ static int __cmd_inject(struct perf_inject *inject)evlist__remove (session->evlist, evsel);evsel__delete (evsel); } -if (inject->strip) -strip_fini (inject); } session->header.data_offset = output_data_offset; session->header.data_size = inject->bytes_written;