From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752446AbaFLWJp (ORCPT ); Thu, 12 Jun 2014 18:09:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64138 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752407AbaFLWJm (ORCPT ); Thu, 12 Jun 2014 18:09:42 -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 12/17] perf tools: Add ordered_events_queue_free function Date: Fri, 13 Jun 2014 00:08:28 +0200 Message-Id: <1402610913-19059-13-git-send-email-jolsa@kernel.org> In-Reply-To: <1402610913-19059-1-git-send-email-jolsa@kernel.org> References: <1402610913-19059-1-git-send-email-jolsa@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Adding ordered_events_queue_free function to release all the struct ordered_events_queue data. It's replacement for former perf_session_free_sample_buffers 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/ordered-events.c | 11 +++++++++++ tools/perf/util/ordered-events.h | 1 + tools/perf/util/session.c | 17 ++--------------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/tools/perf/util/ordered-events.c b/tools/perf/util/ordered-events.c index 0ca34ee..eaf2c47 100644 --- a/tools/perf/util/ordered-events.c +++ b/tools/perf/util/ordered-events.c @@ -200,3 +200,14 @@ void ordered_events_queue_init(struct ordered_events_queue *q) q->max_alloc_size = (u64) -1; q->cur_alloc_size = 0; } + +void ordered_events_queue_free(struct ordered_events_queue *q) +{ + while (!list_empty(&q->to_free)) { + struct ordered_event *event; + + event = list_entry(q->to_free.next, struct ordered_event, list); + list_del(&event->list); + free(event); + } +} diff --git a/tools/perf/util/ordered-events.h b/tools/perf/util/ordered-events.h index 0633b09..25ec273 100644 --- a/tools/perf/util/ordered-events.h +++ b/tools/perf/util/ordered-events.h @@ -41,4 +41,5 @@ void ordered_event_put(struct ordered_events_queue *q, int ordered_events_flush(struct perf_session *s, struct perf_tool *tool, enum oeq_flush how); void ordered_events_queue_init(struct ordered_events_queue *q); +void ordered_events_queue_free(struct ordered_events_queue *q); #endif /* __ORDERED_EVENTS_H */ diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 09d1052..26bedac 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -444,19 +444,6 @@ static perf_event__swap_op perf_event__swap_ops[] = { [PERF_RECORD_HEADER_MAX] = NULL, }; -static void perf_session_free_sample_buffers(struct perf_session *session) -{ - struct ordered_events_queue *q = &session->ordered_events; - - while (!list_empty(&q->to_free)) { - struct ordered_event *sq; - - sq = list_entry(q->to_free.next, struct ordered_event, list); - list_del(&sq->list); - free(sq); - } -} - /* * When perf record finishes a pass on every buffers, it records this pseudo * event. @@ -1092,7 +1079,7 @@ done: out_err: free(buf); perf_session__warn_about_errors(session, tool); - perf_session_free_sample_buffers(session); + ordered_events_queue_free(&session->ordered_events); return err; } @@ -1227,7 +1214,7 @@ out: out_err: ui_progress__finish(); perf_session__warn_about_errors(session, tool); - perf_session_free_sample_buffers(session); + ordered_events_queue_free(&session->ordered_events); return err; } -- 1.8.3.1