From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752401AbaFRO7j (ORCPT ); Wed, 18 Jun 2014 10:59:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20207 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752277AbaFRO7e (ORCPT ); Wed, 18 Jun 2014 10:59:34 -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 07/18] perf tools: Limit ordered events queue size Date: Wed, 18 Jun 2014 16:58:48 +0200 Message-Id: <1403103539-16807-8-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 Add limit to the ordered events queue allocation. This way we will be able to control the size of the queue buffers. There's no limit at the moment (it's set to (u64) -1). The config code will come in following patches. 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 | 12 +++++++++--- tools/perf/util/session.h | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index f6991ac..5c00d9b 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -79,6 +79,8 @@ struct perf_session *perf_session__new(struct perf_data_file *file, INIT_LIST_HEAD(&session->ordered_events.events); INIT_LIST_HEAD(&session->ordered_events.cache); INIT_LIST_HEAD(&session->ordered_events.to_free); + session->ordered_events.max_alloc_size = (u64) -1; + session->ordered_events.cur_alloc_size = 0; machines__init(&session->machines); if (file) { @@ -520,7 +522,7 @@ static void queue_event(struct ordered_events_queue *q, struct ordered_event *ne static struct ordered_event *alloc_event(struct ordered_events_queue *q) { struct list_head *cache = &q->cache; - struct ordered_event *new; + struct ordered_event *new = NULL; if (!list_empty(cache)) { new = list_entry(cache->next, struct ordered_event, list); @@ -529,10 +531,14 @@ static struct ordered_event *alloc_event(struct ordered_events_queue *q) new = q->buffer + q->buffer_idx; if (++q->buffer_idx == MAX_SAMPLE_BUFFER) q->buffer = NULL; - } else { - q->buffer = malloc(MAX_SAMPLE_BUFFER * sizeof(*new)); + } else if (q->cur_alloc_size < q->max_alloc_size) { + size_t size = MAX_SAMPLE_BUFFER * sizeof(*new); + + q->buffer = malloc(size); if (!q->buffer) return NULL; + + q->cur_alloc_size += size; list_add(&q->buffer->list, &q->to_free); /* First entry is abused to maintain the to_free list. */ diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h index 76b897f..9f64ac9 100644 --- a/tools/perf/util/session.h +++ b/tools/perf/util/session.h @@ -20,6 +20,8 @@ struct ordered_events_queue { u64 last_flush; u64 next_flush; u64 max_timestamp; + u64 max_alloc_size; + u64 cur_alloc_size; struct list_head events; struct list_head cache; struct list_head to_free; -- 1.8.3.1