From 79a30fe4f3758c98e1b7a474952b9701d513e580 Mon Sep 17 00:00:00 2001 From: Jiri Olsa Date: Tue, 10 Jun 2014 22:31:35 +0200 Subject: [PATCH] perf tools: Make perf_session__deliver_event global Making perf_session__deliver_event global function, as it will be called from another object in following patch. Signed-off-by: Jiri Olsa Acked-by: David Ahern Cc: Corey Ashford Cc: David Ahern Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Jean Pihet Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Link: http://lkml.kernel.org/n/tip-rz7s2b8uwv567bigckh75gvk@git.kernel.org [ Fixup naming to match class__method schema, as now is more widely exposed ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/session.c | 23 ++++++++--------------- tools/perf/util/session.h | 5 +++++ 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index bd2483b6b446..ed6b7f14631f 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -571,12 +571,6 @@ ordered_events__delete(struct ordered_events *oe, struct ordered_event *event) oe->nr_events--; } -static int perf_session_deliver_event(struct perf_session *session, - union perf_event *event, - struct perf_sample *sample, - struct perf_tool *tool, - u64 file_offset); - static int __ordered_events__flush(struct perf_session *s, struct perf_tool *tool) { @@ -607,8 +601,8 @@ static int __ordered_events__flush(struct perf_session *s, if (ret) pr_err("Can't parse sample, err = %d\n", ret); else { - ret = perf_session_deliver_event(s, iter->event, &sample, tool, - iter->file_offset); + ret = perf_session__deliver_event(s, iter->event, &sample, tool, + iter->file_offset); if (ret) return ret; } @@ -1003,11 +997,10 @@ perf_session__deliver_sample(struct perf_session *session, &sample->read.one, machine); } -static int perf_session_deliver_event(struct perf_session *session, - union perf_event *event, - struct perf_sample *sample, - struct perf_tool *tool, - u64 file_offset) +int perf_session__deliver_event(struct perf_session *session, + union perf_event *event, + struct perf_sample *sample, + struct perf_tool *tool, u64 file_offset) { struct perf_evsel *evsel; struct machine *machine; @@ -1152,8 +1145,8 @@ static s64 perf_session__process_event(struct perf_session *session, return ret; } - return perf_session_deliver_event(session, event, &sample, tool, - file_offset); + return perf_session__deliver_event(session, event, &sample, tool, + file_offset); } void perf_event_header__bswap(struct perf_event_header *hdr) diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h index a09e3c8d825a..03da1cb14dc1 100644 --- a/tools/perf/util/session.h +++ b/tools/perf/util/session.h @@ -72,6 +72,11 @@ int perf_session_queue_event(struct perf_session *s, union perf_event *event, void perf_tool__fill_defaults(struct perf_tool *tool); +int perf_session__deliver_event(struct perf_session *session, + union perf_event *event, + struct perf_sample *sample, + struct perf_tool *tool, u64 file_offset); + int perf_session__resolve_callchain(struct perf_session *session, struct perf_evsel *evsel, struct thread *thread, -- 2.20.1