From: Namhyung Kim <namhyung@kernel.org>
To: Jiri Olsa <jolsa@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Corey Ashford <cjashfor@linux.vnet.ibm.com>,
David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Ingo Molnar <mingo@kernel.org>,
Jean Pihet <jean.pihet@linaro.org>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: Re: [PATCH 05/17] perf tools: Add ordered_events_(get|put) interface
Date: Fri, 13 Jun 2014 21:05:05 +0900 [thread overview]
Message-ID: <1402661105.2178.19.camel@leonhard> (raw)
In-Reply-To: <1402610913-19059-6-git-send-email-jolsa@kernel.org>
2014-06-13 (금), 00:08 +0200, Jiri Olsa:
> +#define MAX_SAMPLE_BUFFER (64 * 1024 / sizeof(struct ordered_event))
> +static struct ordered_event *alloc_event(struct ordered_events_queue *q)
> +{
> + struct list_head *cache = &q->cache;
> + struct ordered_event *new;
> +
> + if (!list_empty(cache)) {
> + new = list_entry(cache->next, struct ordered_event, list);
> + list_del(&new->list);
> + } else if (q->buffer) {
> + 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));
> + if (!q->buffer)
> + return NULL;
> + list_add(&q->buffer->list, &q->to_free);
> + q->buffer_idx = 2;
> + new = q->buffer + 1;
Hmm.. can we add a comment that the first entry is abused to maintain
the to_free list?
> + }
> +
> + return new;
> +}
> +
> +static struct ordered_event*
> +ordered_events_get(struct ordered_events_queue *q, u64 timestamp)
> +{
> + struct ordered_event *new;
> +
> + new = alloc_event(q);
> + if (new) {
> + new->timestamp = timestamp;
> + queue_event(q, new);
> + }
> +
> + return new;
> +}
> +
> +static void
> +ordered_event_put(struct ordered_events_queue *q, struct ordered_event *iter)
> +{
> + list_del(&iter->list);
> + list_add(&iter->list, &q->cache);
list_move(&iter->list, &q->cache) ?
> + q->nr_events--;
> +}
[SNIP]
> @@ -639,29 +681,13 @@ int perf_session_queue_event(struct perf_session *s, union perf_event *event,
> return -EINVAL;
> }
>
> - if (!list_empty(cache)) {
> - new = list_entry(cache->next, struct ordered_event, list);
> - list_del(&new->list);
> - } else if (q->buffer) {
> - 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));
> - if (!q->buffer)
> - return -ENOMEM;
> - list_add(&q->buffer->list, &q->to_free);
> - q->buffer_idx = 2;
> - new = q->buffer + 1;
> + new = ordered_events_get(q, timestamp);
> + if (new) {
> + new->file_offset = file_offset;
> + new->event = event;
> }
What about make it like below:
if (!new)
return -ENOMEM;
This way we can share more of the original code.
Thanks,
Namhyung
>
> - new->timestamp = timestamp;
> - new->file_offset = file_offset;
> - new->event = event;
> -
> - __queue_event(new, s);
> -
> - return 0;
> + return new ? 0 : -ENOMEM;
> }
>
> static void callchain__printf(struct perf_sample *sample)
next prev parent reply other threads:[~2014-06-13 12:05 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-12 22:08 [PATCH 00/17] perf tools: Factor ordered samples queue Jiri Olsa
2014-06-12 22:08 ` [PATCH 01/17] perf tools: Always force PERF_RECORD_FINISHED_ROUND event Jiri Olsa
2014-06-13 11:51 ` Namhyung Kim
2014-06-15 17:17 ` Jiri Olsa
2014-06-12 22:08 ` [PATCH 02/17] perf tools: Fix accounting of ordered samples queue Jiri Olsa
2014-06-12 22:08 ` [PATCH 03/17] perf tools: Rename ordered_samples to ordered_events Jiri Olsa
2014-06-12 22:08 ` [PATCH 04/17] perf tools: Rename ordered_events_queue members Jiri Olsa
2014-06-12 22:08 ` [PATCH 05/17] perf tools: Add ordered_events_(get|put) interface Jiri Olsa
2014-06-13 12:05 ` Namhyung Kim [this message]
2014-06-15 17:27 ` Jiri Olsa
2014-06-12 22:08 ` [PATCH 06/17] perf tools: Factor ordered_events_flush to be more generic Jiri Olsa
2014-06-12 22:08 ` [PATCH 07/17] perf tools: Limit ordered events queue size Jiri Olsa
2014-06-12 22:08 ` [PATCH 08/17] perf tools: Flush ordered events in case of allocation failure Jiri Olsa
2014-06-12 22:08 ` [PATCH 09/17] perf tools: Make perf_session_deliver_event global Jiri Olsa
2014-06-12 22:08 ` [PATCH 10/17] perf tools: Create ordered-events object Jiri Olsa
2014-06-12 22:08 ` [PATCH 11/17] perf tools: Add ordered_events_queue_init function Jiri Olsa
2014-06-12 22:08 ` [PATCH 12/17] perf tools: Add ordered_events_queue_free function Jiri Olsa
2014-06-12 22:08 ` [PATCH 13/17] perf tools: Add perf_config_u64 function Jiri Olsa
2014-06-13 12:07 ` Namhyung Kim
2014-06-15 17:48 ` Jiri Olsa
2014-06-12 22:08 ` [PATCH 14/17] perf tools: Add report.queue-size config file option Jiri Olsa
2014-06-13 12:08 ` Namhyung Kim
2014-06-15 17:54 ` Jiri Olsa
2014-06-12 22:08 ` [PATCH 15/17] perf tools: Add debug prints for ordered events queue Jiri Olsa
2014-06-13 12:12 ` Namhyung Kim
2014-06-15 17:58 ` Jiri Olsa
2014-06-12 22:08 ` [PATCH 16/17] perf tools: Limit the ordered events queue by default to 100MB Jiri Olsa
2014-06-12 22:08 ` [PATCH 17/17] perf tools: Allow out of order messages in forced flush Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1402661105.2178.19.camel@leonhard \
--to=namhyung@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=dsahern@gmail.com \
--cc=fweisbec@gmail.com \
--cc=jean.pihet@linaro.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).