linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@kernel.org>,
	Corey Ashford <cjashfor@linux.vnet.ibm.com>,
	David Ahern <dsahern@gmail.com>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	Jean Pihet <jean.pihet@linaro.org>,
	Namhyung Kim <namhyung@kernel.org>,
	Paul Mackerras <paulus@samba.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 13/33] perf tools: Make perf_session__deliver_event global
Date: Mon,  4 Aug 2014 13:17:24 -0300	[thread overview]
Message-ID: <1407169064-25625-14-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1407169064-25625-1-git-send-email-acme@kernel.org>

From: Jiri Olsa <jolsa@kernel.org>

Making perf_session__deliver_event global function, as it will be called
from another object in following patch.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: David Ahern <dsahern@gmail.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jean Pihet <jean.pihet@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
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 <acme@redhat.com>

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 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,
-- 
1.9.3


  parent reply	other threads:[~2014-08-04 16:19 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-04 16:17 [GIT PULL 00/33] perf/core improvements and fixes Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 01/33] perf tools: Fix arm64 build error Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 02/33] perf evlist: Don't run workload if not told to Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 03/33] perf symbols: Make sure --symfs usage includes the path separator Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 04/33] perf kvm stat: Properly show submicrosecond times Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 05/33] perf record: Allow the user to disable time stamps Arnaldo Carvalho de Melo
2014-08-05  6:08   ` Ingo Molnar
2014-08-05 13:33     ` Arnaldo Carvalho de Melo
2014-08-12 14:58       ` Ingo Molnar
2014-08-12 15:29         ` Arnaldo Carvalho de Melo
2014-08-13  5:08           ` Ingo Molnar
2014-08-05 14:17     ` Andi Kleen
2014-08-05 14:31       ` Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 06/33] perf tools: Rename ordered_samples bool to ordered_events Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 07/33] perf tools: Rename ordered_samples struct " Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 08/33] perf tools: Rename ordered_events members Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 09/33] perf tools: Add ordered_events__(new|delete) interface Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 10/33] perf tools: Factor ordered_events__flush to be more generic Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 11/33] perf tools: Limit ordered events queue size Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 12/33] perf tools: Flush ordered events in case of allocation failure Arnaldo Carvalho de Melo
2014-08-04 16:17 ` Arnaldo Carvalho de Melo [this message]
2014-08-04 16:17 ` [PATCH 14/33] perf tools: Create ordered-events object Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 15/33] perf tools: Use list_move in ordered_events_delete function Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 16/33] perf tools: Add ordered_events__init function Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 17/33] perf tools: Add ordered_events__free function Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 18/33] perf tools: Add perf_config_u64 function Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 19/33] perf tools: Add report.queue-size config file option Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 20/33] perf tools: Add debug prints for ordered events queue Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 21/33] perf tools: Allow out of order messages in forced flush Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 22/33] perf tools: Show better error message in case we fail to open counters due to EBUSY error Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 23/33] perf kmem: Do not ignore mmap events Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 24/33] perf tools: Fix make PYTHON override Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 25/33] perf tools: Left-align output contents Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 26/33] perf tools: Make __hpp__fmt() receive an additional len argument Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 27/33] perf tools: Save column length in perf_hpp_fmt Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 28/33] perf report: Honor column width setting Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 29/33] perf top: Add -w option for setting column width Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 30/33] perf tools: Add name field into perf_hpp_fmt Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 31/33] perf tools: Fix column alignment when headers aren't shown on TUI Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 32/33] perf tools: Fix PERF_FLAG_FD_CLOEXEC flag probing event type open counters due to EBUSY error Arnaldo Carvalho de Melo
2014-08-04 16:17 ` [PATCH 33/33] perf tools: Default to python version 2 Arnaldo Carvalho de Melo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1407169064-25625-14-git-send-email-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=cjashfor@linux.vnet.ibm.com \
    --cc=dsahern@gmail.com \
    --cc=fweisbec@gmail.com \
    --cc=jean.pihet@linaro.org \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).