[PATCH 13/18] perf tools: Add ordered_events_queue_free function

[Jiri Olsa]

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 <a...@kernel.org>
Cc: Corey Ashford <cjash...@linux.vnet.ibm.com>
Cc: David Ahern <dsah...@gmail.com>
Cc: Frederic Weisbecker <fweis...@gmail.com>
Cc: Ingo Molnar <mi...@kernel.org>
Cc: Jean Pihet <jean.pi...@linaro.org>
Cc: Namhyung Kim <namhy...@kernel.org>
Cc: Paul Mackerras <pau...@samba.org>
Cc: Peter Zijlstra <a.p.zijls...@chello.nl>
Signed-off-by: Jiri Olsa <jo...@kernel.org>
---
 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 42b1bbc..946619c 100644
--- a/tools/perf/util/ordered-events.c
+++ b/tools/perf/util/ordered-events.c
@@ -201,3 +201,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 59d13a7..28fe6a1 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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/