perf evlist: Adopt __set_tracepoint_handlers method from perf_session
The following commit has been merged into the perf/core branch of tip:
Commit-ID: c0e53476ab5087353547cbcd37f001d98941326c Gitweb: https://git.kernel.org/tip/c0e53476ab5087353547cbcd37f001d98941326c Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 01 Oct 2019 11:14:26 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Mon, 07 Oct 2019 12:22:17 -03:00
perf evlist: Adopt __set_tracepoint_handlers method from perf_session
It all operates on the evsels in the session's evlist, so move it to the evlist layer to make it useful to tools not using perf_session, just evlists, like 'perf trace' in live mode.
Cc Adrian Hunter <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/evlist.c | 24 ++++++++++++++++++++++++ tools/perf/util/evlist.h | 7 +++++++ tools/perf/util/session.c | 29 ----------------------------- tools/perf/util/session.h | 6 +----- 4 files changed, 32 insertions(+), 34 deletions(-)
tools/perf/util/evlist.c +24 -0
@@ -186,6 +186,30 @@ void perf_evlist__splice_list_tail(struct evlist *evlist, } } +int __evlist__set_tracepoints_handlers (struct evlist *evlist, +const struct evsel_str_handler *assocs,size_t nr_assocs) +{ +struct evsel *evsel; +size_t i; +int err; + +for (i =0 ; i < nr_assocs; i++) { +// Adding a handler for an event not in this evlist, just ignore it. + evsel =perf_evlist__find_tracepoint_by_name (evlist, assocs[i].name); +if (evsel ==NULL ) +continue ; + + err = -EEXIST ; +if (evsel->handler !=NULL ) + goto out; + evsel->handler = assocs[i].handler; + } + + err =0 ; +out: +return err; +} +void __perf_evlist__set_leader (struct list_head *list) {struct evsel *evsel, *leader;
tools/perf/util/evlist.h +7 -0
@@ -118,6 +118,13 @@ void perf_evlist__stop_sb_thread(struct evlist *evlist);int perf_evlist__add_newtp (struct evlist *evlist,const char *sys,const char *name,void *handler); +int __evlist__set_tracepoints_handlers (struct evlist *evlist, +const struct evsel_str_handler *assocs, +size_t nr_assocs); + +#define evlist__set_tracepoints_handlers (evlist, array) \ + __evlist__set_tracepoints_handlers(evlist, array, ARRAY_SIZE(array)) +void __perf_evlist__set_sample_bit (struct evlist *evlist,enum perf_event_sample_format bit); void __perf_evlist__reset_sample_bit(struct evlist *evlist,
tools/perf/util/session.c +0 -29
@@ -2355,35 +2355,6 @@ void perf_session__fprintf_info(struct perf_session *session, FILE *fp,fprintf (fp,"# ========\n#\n" ); } - -int __perf_session__set_tracepoints_handlers (struct perf_session *session, -const struct evsel_str_handler *assocs, -size_t nr_assocs) -{ -struct evsel *evsel; -size_t i; -int err; - -for (i =0 ; i < nr_assocs; i++) { -/* -* Adding a handler for an event not in the session, -* just ignore it. -*/ - evsel =perf_evlist__find_tracepoint_by_name (session->evlist, assocs[i].name); -if (evsel ==NULL ) -continue ; - - err = -EEXIST ; -if (evsel->handler !=NULL ) - goto out; - evsel->handler = assocs[i].handler; - } - - err =0 ; -out: -return err; -} -int perf_event__process_id_index (struct perf_session *session,union perf_event *event) {
tools/perf/util/session.h +1 -5
@@ -120,12 +120,8 @@ void perf_session__fprintf_info(struct perf_session *s, FILE *fp, bool full);struct evsel_str_handler ; -int __perf_session__set_tracepoints_handlers (struct perf_session *session, -const struct evsel_str_handler *assocs, -size_t nr_assocs); -#define perf_session__set_tracepoints_handlers (session, array) \ - __perf_session__set_tracepoints_handlers(session, array, ARRAY_SIZE(array)) + __evlist__set_tracepoints_handlers(session->evlist, array, ARRAY_SIZE(array))extern volatile int session_done;