From: Jiri Olsa <jolsa@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Jiri Olsa <jolsa@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>,
Namhyung Kim <namhyung@kernel.org>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCH 16/18] perf tools: Add debug prints for ordered events queue
Date: Wed, 18 Jun 2014 16:58:57 +0200 [thread overview]
Message-ID: <1403103539-16807-17-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1403103539-16807-1-git-send-email-jolsa@kernel.org>
Adding some prints for ordered events queue, to help
debug issues.
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jean Pihet <jean.pihet@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/builtin-report.c | 4 +++
tools/perf/util/ordered-events.c | 54 ++++++++++++++++++++++++++++++++++++++++
tools/perf/util/ordered-events.h | 2 ++
3 files changed, 60 insertions(+)
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 09b9d0c..130ab5c 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -82,6 +82,10 @@ static int report__config(const char *var, const char *value, void *cb)
rep->queue_size = perf_config_u64(var, value);
return 0;
}
+ if (!strcmp(var, "report.queue-debug")) {
+ debug_sample_queue = perf_config_int(var, value);
+ return 0;
+ }
return perf_default_config(var, value, cb);
}
diff --git a/tools/perf/util/ordered-events.c b/tools/perf/util/ordered-events.c
index 946619c..662ee0c 100644
--- a/tools/perf/util/ordered-events.c
+++ b/tools/perf/util/ordered-events.c
@@ -4,6 +4,37 @@
#include "session.h"
#include "asm/bug.h"
+int debug_sample_queue;
+
+static int pr_level(int level, const char *fmt, ...)
+{
+ int ret = 0;
+
+ if (unlikely(debug_sample_queue >= level)) {
+ va_list args;
+
+ va_start(args, fmt);
+ ret = vfprintf(stderr, fmt, args);
+ va_end(args);
+ }
+
+ return ret;
+}
+
+#define pr_N(n, fmt, ...) \
+ pr_level(n, fmt, ##__VA_ARGS__)
+#define pr(fmt, ...) pr_N(1, pr_fmt(fmt), ##__VA_ARGS__)
+
+static int pr_time(const char *str, u64 time)
+{
+ u64 secs, usecs, nsecs = time;
+
+ secs = nsecs / NSECS_PER_SEC;
+ nsecs -= secs * NSECS_PER_SEC;
+ usecs = nsecs / NSECS_PER_USEC;
+ return fprintf(stderr, "\t[%13lu.%06lu] %s\n", secs, usecs, str);
+}
+
static void queue_event(struct ordered_events_queue *q, struct ordered_event *new)
{
struct ordered_event *last = q->last;
@@ -68,6 +99,9 @@ static struct ordered_event *alloc_event(struct ordered_events_queue *q)
if (!q->buffer)
return NULL;
+ pr("alloc size %" PRIu64 "B, max %" PRIu64 "B\n",
+ q->cur_alloc_size, q->max_alloc_size);
+
q->cur_alloc_size += size;
list_add(&q->buffer->list, &q->to_free);
@@ -183,6 +217,19 @@ int ordered_events_flush(struct perf_session *s, struct perf_tool *tool,
break;
};
+ if (unlikely(debug_sample_queue)) {
+ static const char * const str[] = {
+ "FINAL",
+ "ROUND",
+ "HALF ",
+ };
+
+ fprintf(stderr, "ordered_events_flush %s, nr_events %u\n",
+ str[how], q->nr_events);
+ pr_time("next_flush", q->next_flush);
+ pr_time("max_timestamp", q->max_timestamp);
+ }
+
err = __ordered_events_flush(s, tool);
if (!err) {
@@ -190,6 +237,13 @@ int ordered_events_flush(struct perf_session *s, struct perf_tool *tool,
q->next_flush = q->max_timestamp;
}
+ if (unlikely(debug_sample_queue)) {
+ fprintf(stderr, "ordered_events_flush nr_events %u\n",
+ q->nr_events);
+ pr_time("next_flush", q->next_flush);
+ pr_time("last_flush", q->last_flush);
+ }
+
return err;
}
diff --git a/tools/perf/util/ordered-events.h b/tools/perf/util/ordered-events.h
index 04cb295..8a717de 100644
--- a/tools/perf/util/ordered-events.h
+++ b/tools/perf/util/ordered-events.h
@@ -48,4 +48,6 @@ ordered_events_queue_alloc_size(struct ordered_events_queue *q, u64 size)
{
q->max_alloc_size = size;
}
+
+extern int debug_sample_queue;
#endif /* __ORDERED_EVENTS_H */
--
1.8.3.1
next prev parent reply other threads:[~2014-06-18 14:59 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-18 14:58 [PATCHv2 00/18] perf tools: Factor ordered samples queue Jiri Olsa
2014-06-18 14:58 ` [PATCH 01/18] perf tools: Always force PERF_RECORD_FINISHED_ROUND event Jiri Olsa
2014-06-18 14:58 ` [PATCH 02/18] perf tools: Fix accounting of ordered samples queue Jiri Olsa
2014-06-18 14:58 ` [PATCH 03/18] perf tools: Rename ordered_samples to ordered_events Jiri Olsa
2014-06-18 14:58 ` [PATCH 04/18] perf tools: Rename ordered_events_queue members Jiri Olsa
2014-06-18 14:58 ` [PATCH 05/18] perf tools: Add ordered_events_(get|put) interface Jiri Olsa
2014-06-27 23:06 ` David Ahern
2014-06-29 16:39 ` Jiri Olsa
2014-06-29 16:50 ` David Ahern
2014-06-30 15:02 ` Arnaldo Carvalho de Melo
2014-06-30 15:03 ` Arnaldo Carvalho de Melo
2014-06-18 14:58 ` [PATCH 06/18] perf tools: Factor ordered_events_flush to be more generic Jiri Olsa
2014-06-18 14:58 ` [PATCH 07/18] perf tools: Limit ordered events queue size Jiri Olsa
2014-06-27 23:11 ` David Ahern
2014-06-30 17:58 ` Jiri Olsa
2014-06-18 14:58 ` [PATCH 08/18] perf tools: Flush ordered events in case of allocation failure Jiri Olsa
2014-06-27 23:07 ` David Ahern
2014-06-29 16:41 ` Jiri Olsa
2014-06-18 14:58 ` [PATCH 09/18] perf tools: Make perf_session_deliver_event global Jiri Olsa
2014-06-18 14:58 ` [PATCH 10/18] perf tools: Create ordered-events object Jiri Olsa
2014-06-18 14:58 ` [PATCH 11/18] perf tools: Use list_move in ordered_event_put function Jiri Olsa
2014-06-18 14:58 ` [PATCH 12/18] perf tools: Add ordered_events_queue_init function Jiri Olsa
2014-06-18 14:58 ` [PATCH 13/18] perf tools: Add ordered_events_queue_free function Jiri Olsa
2014-06-18 14:58 ` [PATCH 14/18] perf tools: Add perf_config_u64 function Jiri Olsa
2014-06-27 23:08 ` David Ahern
2014-06-29 16:44 ` Jiri Olsa
2014-06-18 14:58 ` [PATCH 15/18] perf tools: Add report.queue-size config file option Jiri Olsa
2014-06-18 14:58 ` Jiri Olsa [this message]
2014-06-28 2:52 ` [PATCH 16/18] perf tools: Add debug prints for ordered events queue David Ahern
2014-06-29 16:46 ` Jiri Olsa
2014-06-29 16:52 ` David Ahern
2014-06-18 14:58 ` [PATCH 17/18] perf tools: Limit the ordered events queue by default to 100MB Jiri Olsa
2014-06-18 14:58 ` [PATCH 18/18] perf tools: Allow out of order messages in forced flush Jiri Olsa
2014-06-18 19:44 ` [PATCHv2 00/18] perf tools: Factor ordered samples queue David Ahern
2014-06-19 10:34 ` Jiri Olsa
2014-06-19 17:54 ` David Ahern
2014-06-20 7:15 ` 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=1403103539-16807-17-git-send-email-jolsa@kernel.org \
--to=jolsa@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=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@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).