Re: [PATCH 07/18] perf tools: Limit ordered events queue size

[David Ahern]

On 6/18/14, 8:58 AM, Jiri Olsa wrote:
> @@ -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);

When is cur_alloc_size decremented?

$ git checkout remotes/jolsa/perf/core_ordered_events

$ egrep -r cur_alloc_size tools/perf/
tools/perf//util/ordered-events.c:	} else if (q->cur_alloc_size < 
q->max_alloc_size) {
tools/perf//util/ordered-events.c:		   q->cur_alloc_size, 
q->max_alloc_size);
tools/perf//util/ordered-events.c:		q->cur_alloc_size += size;
tools/perf//util/ordered-events.c:	q->cur_alloc_size = 0;
tools/perf//util/ordered-events.h:	u64			cur_alloc_size;

Does not appear to ever be decremented.

David

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