From: Jiri Olsa <jolsa@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Jiri Olsa <jolsa@kernel.org>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Corey Ashford <cjashfor@linux.vnet.ibm.com>,
David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Ingo Molnar <mingo@kernel.org>,
Jean Pihet <jean.pihet@linaro.org>,
Namhyung Kim <namhyung@kernel.org>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCH 06/17] perf tools: Factor ordered_events_flush to be more generic
Date: Fri, 13 Jun 2014 00:08:22 +0200 [thread overview]
Message-ID: <1402610913-19059-7-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1402610913-19059-1-git-send-email-jolsa@kernel.org>
Centralizing the next_flush calculation under the
ordered_events_flush function.
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
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>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/util/session.c | 47 ++++++++++++++++++++++++++++++++++++-----------
1 file changed, 36 insertions(+), 11 deletions(-)
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 966132d..76df5c9 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -453,6 +453,11 @@ struct ordered_event {
struct list_head list;
};
+enum oeq_flush {
+ OEQ_FLUSH__FINAL,
+ OEQ_FLUSH__ROUND,
+};
+
static void perf_session_free_sample_buffers(struct perf_session *session)
{
struct ordered_events_queue *q = &session->ordered_events;
@@ -565,8 +570,8 @@ static int perf_session_deliver_event(struct perf_session *session,
struct perf_tool *tool,
u64 file_offset);
-static int ordered_events_flush(struct perf_session *s,
- struct perf_tool *tool)
+static int __ordered_events_flush(struct perf_session *s,
+ struct perf_tool *tool)
{
struct ordered_events_queue *q = &s->ordered_events;
struct list_head *head = &q->events;
@@ -616,6 +621,32 @@ static int ordered_events_flush(struct perf_session *s,
return 0;
}
+static int ordered_events_flush(struct perf_session *s, struct perf_tool *tool,
+ enum oeq_flush how)
+{
+ struct ordered_events_queue *q = &s->ordered_events;
+ int err;
+
+ switch (how) {
+ case OEQ_FLUSH__FINAL:
+ q->next_flush = ULLONG_MAX;
+ break;
+
+ case OEQ_FLUSH__ROUND:
+ default:
+ break;
+ };
+
+ err = __ordered_events_flush(s, tool);
+
+ if (!err) {
+ if (how == OEQ_FLUSH__ROUND)
+ q->next_flush = q->max_timestamp;
+ }
+
+ return err;
+}
+
/*
* When perf record finishes a pass on every buffers, it records this pseudo
* event.
@@ -659,11 +690,7 @@ static int process_finished_round(struct perf_tool *tool,
union perf_event *event __maybe_unused,
struct perf_session *session)
{
- int ret = ordered_events_flush(session, tool);
- if (!ret)
- session->ordered_events.next_flush = session->ordered_events.max_timestamp;
-
- return ret;
+ return ordered_events_flush(session, tool, OEQ_FLUSH__ROUND);
}
int perf_session_queue_event(struct perf_session *s, union perf_event *event,
@@ -1245,8 +1272,7 @@ more:
goto more;
done:
/* do the final flush for ordered samples */
- session->ordered_events.next_flush = ULLONG_MAX;
- err = ordered_events_flush(session, tool);
+ err = ordered_events_flush(session, tool, OEQ_FLUSH__FINAL);
out_err:
free(buf);
perf_session__warn_about_errors(session, tool);
@@ -1381,8 +1407,7 @@ more:
out:
/* do the final flush for ordered samples */
- session->ordered_events.next_flush = ULLONG_MAX;
- err = ordered_events_flush(session, tool);
+ err = ordered_events_flush(session, tool, OEQ_FLUSH__FINAL);
out_err:
ui_progress__finish();
perf_session__warn_about_errors(session, tool);
--
1.8.3.1
next prev parent reply other threads:[~2014-06-12 22:09 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-12 22:08 [PATCH 00/17] perf tools: Factor ordered samples queue Jiri Olsa
2014-06-12 22:08 ` [PATCH 01/17] perf tools: Always force PERF_RECORD_FINISHED_ROUND event Jiri Olsa
2014-06-13 11:51 ` Namhyung Kim
2014-06-15 17:17 ` Jiri Olsa
2014-06-12 22:08 ` [PATCH 02/17] perf tools: Fix accounting of ordered samples queue Jiri Olsa
2014-06-12 22:08 ` [PATCH 03/17] perf tools: Rename ordered_samples to ordered_events Jiri Olsa
2014-06-12 22:08 ` [PATCH 04/17] perf tools: Rename ordered_events_queue members Jiri Olsa
2014-06-12 22:08 ` [PATCH 05/17] perf tools: Add ordered_events_(get|put) interface Jiri Olsa
2014-06-13 12:05 ` Namhyung Kim
2014-06-15 17:27 ` Jiri Olsa
2014-06-12 22:08 ` Jiri Olsa [this message]
2014-06-12 22:08 ` [PATCH 07/17] perf tools: Limit ordered events queue size Jiri Olsa
2014-06-12 22:08 ` [PATCH 08/17] perf tools: Flush ordered events in case of allocation failure Jiri Olsa
2014-06-12 22:08 ` [PATCH 09/17] perf tools: Make perf_session_deliver_event global Jiri Olsa
2014-06-12 22:08 ` [PATCH 10/17] perf tools: Create ordered-events object Jiri Olsa
2014-06-12 22:08 ` [PATCH 11/17] perf tools: Add ordered_events_queue_init function Jiri Olsa
2014-06-12 22:08 ` [PATCH 12/17] perf tools: Add ordered_events_queue_free function Jiri Olsa
2014-06-12 22:08 ` [PATCH 13/17] perf tools: Add perf_config_u64 function Jiri Olsa
2014-06-13 12:07 ` Namhyung Kim
2014-06-15 17:48 ` Jiri Olsa
2014-06-12 22:08 ` [PATCH 14/17] perf tools: Add report.queue-size config file option Jiri Olsa
2014-06-13 12:08 ` Namhyung Kim
2014-06-15 17:54 ` Jiri Olsa
2014-06-12 22:08 ` [PATCH 15/17] perf tools: Add debug prints for ordered events queue Jiri Olsa
2014-06-13 12:12 ` Namhyung Kim
2014-06-15 17:58 ` Jiri Olsa
2014-06-12 22:08 ` [PATCH 16/17] perf tools: Limit the ordered events queue by default to 100MB Jiri Olsa
2014-06-12 22:08 ` [PATCH 17/17] perf tools: Allow out of order messages in forced flush Jiri Olsa
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=1402610913-19059-7-git-send-email-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=dsahern@gmail.com \
--cc=fweisbec@gmail.com \
--cc=jean.pihet@linaro.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).