From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752264AbaFRO7a (ORCPT ); Wed, 18 Jun 2014 10:59:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47605 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751451AbaFRO73 (ORCPT ); Wed, 18 Jun 2014 10:59:29 -0400 From: Jiri Olsa To: linux-kernel@vger.kernel.org Cc: Jiri Olsa , Arnaldo Carvalho de Melo , Corey Ashford , David Ahern , Frederic Weisbecker , Ingo Molnar , Jean Pihet , Namhyung Kim , Paul Mackerras , Peter Zijlstra Subject: [PATCH 06/18] perf tools: Factor ordered_events_flush to be more generic Date: Wed, 18 Jun 2014 16:58:47 +0200 Message-Id: <1403103539-16807-7-git-send-email-jolsa@kernel.org> In-Reply-To: <1403103539-16807-1-git-send-email-jolsa@kernel.org> References: <1403103539-16807-1-git-send-email-jolsa@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Centralizing the next_flush calculation under the ordered_events_flush function. Cc: Arnaldo Carvalho de Melo Cc: Corey Ashford Cc: David Ahern Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Jean Pihet Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Signed-off-by: Jiri Olsa --- 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 7ce26c4..f6991ac 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; @@ -567,8 +572,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; @@ -618,6 +623,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. @@ -661,11 +692,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, @@ -1247,8 +1274,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); @@ -1383,8 +1409,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