From: Jiri Olsa <jolsa@kernel.org>
To: Peter Zijlstra <a.p.zijlstra@chello.nl>, Ingo Molnar <mingo@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
David Ahern <dsahern@gmail.com>, Andi Kleen <ak@linux.intel.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Andy Lutomirski <luto@amacapital.net>,
Arnaldo Carvalho de Melo <acme@kernel.org>
Subject: [PATCH 04/21] perf tools: Add perf_sample__copy|free functions
Date: Wed, 24 Jan 2018 12:51:26 +0100 [thread overview]
Message-ID: <20180124115143.14322-5-jolsa@kernel.org> (raw)
In-Reply-To: <20180124115143.14322-1-jolsa@kernel.org>
Later in the patchset we are going to queue some samples
for later processing. To be able to do that I'm adding
perf_sample__copy|free functions that duplicate|free
perf_sample data.
Link: http://lkml.kernel.org/n/tip-lcwyac9i125cq89m9msvgu9f@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/builtin-report.c | 75 +++++++++++++++++++++++++++++++++++++++++++++
tools/perf/util/event.h | 1 +
2 files changed, 76 insertions(+)
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 9bae7f11691c..a08e2c88070a 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -193,6 +193,81 @@ static int hist_iter__branch_callback(struct hist_entry_iter *iter,
return err;
}
+static void perf_sample__free(struct perf_sample *sample)
+{
+ if (sample->copy) {
+ free(sample->callchain);
+ free(sample->raw_data);
+ free(sample->branch_stack);
+ free(sample->user_regs.regs);
+ free(sample->intr_regs.regs);
+ free(sample->user_stack.data);
+ }
+}
+
+static __maybe_unused int
+perf_sample__copy(struct perf_sample *dst, struct perf_sample *src)
+{
+ int ret = -1;
+ u64 size;
+
+ *dst = *src;
+
+ dst->callchain = NULL;
+ dst->raw_data = NULL;
+ dst->branch_stack = NULL;
+ dst->user_regs.regs = NULL;
+ dst->intr_regs.regs = NULL;
+ dst->user_stack.data = NULL;
+
+#define DUP(__field, __size) \
+ do { \
+ dst->__field = memdup(src->__field, __size); \
+ if (!dst->__field) \
+ goto error; \
+ } while (0)
+
+ if (src->callchain) {
+ size = (src->callchain->nr + 1) * sizeof(u64);
+ DUP(callchain, size);
+ }
+
+ if (src->raw_data)
+ DUP(raw_data, src->raw_size);
+
+ if (src->branch_stack) {
+ size = sizeof(u64);
+ size += src->branch_stack->nr * sizeof(struct branch_entry);
+ DUP(branch_stack, size);
+ }
+
+ if (src->user_regs.regs) {
+ u64 mask = src->user_regs.mask;
+
+ size = hweight_long(mask) * sizeof(u64);
+ DUP(user_regs.regs, size);
+ }
+
+ if (src->intr_regs.regs) {
+ u64 mask = src->intr_regs.mask;
+
+ size = hweight_long(mask) * sizeof(u64);
+ DUP(intr_regs.regs, size);
+ }
+
+ if (src->user_stack.data)
+ DUP(user_stack.data, src->user_stack.size);
+
+#undef DUP
+ dst->copy = true;
+ ret = 0;
+
+error:
+ if (ret)
+ perf_sample__free(dst);
+ return ret;
+}
+
static int
perf_sample__process(struct perf_sample *sample, struct addr_location *al,
struct perf_evsel *evsel, struct report *rep)
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 0f794744919c..546539da1592 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -189,6 +189,7 @@ enum {
#define MAX_INSN 16
struct perf_sample {
+ bool copy;
u64 ip;
u32 pid, tid;
u64 time;
--
2.13.6
next prev parent reply other threads:[~2018-01-24 11:51 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-24 11:51 [RFC 00/21] perf tools: Add perf_evsel__is_sample_bit function Jiri Olsa
2018-01-24 11:51 ` [PATCH 01/21] " Jiri Olsa
2018-01-24 11:51 ` [PATCH 02/21] perf tools: Add perf_sample__process function Jiri Olsa
2018-01-24 11:51 ` [PATCH 03/21] perf tools: Add callchain__printf for pure callchain dump Jiri Olsa
2018-01-24 11:51 ` Jiri Olsa [this message]
2018-01-24 11:51 ` [PATCH 05/21] perf: Add TIF_PERF_USER_DATA bit Jiri Olsa
2018-01-24 11:51 ` [PATCH 06/21] perf: Add PERF_RECORD_USER_DATA event processing Jiri Olsa
2018-01-24 11:51 ` [PATCH 07/21] perf: Add PERF_SAMPLE_USER_DATA_ID sample type Jiri Olsa
2018-01-24 11:51 ` [PATCH 08/21] perf: Add PERF_SAMPLE_CALLCHAIN to user data event Jiri Olsa
2018-01-24 11:51 ` [PATCH 09/21] perf: Export running sample length values through debugfs Jiri Olsa
2018-01-24 11:51 ` [PATCH 10/21] perf tools: Sync perf_event.h uapi header Jiri Olsa
2018-01-24 11:51 ` [PATCH 11/21] perf tools: Add perf_sample__parse function Jiri Olsa
2018-01-24 11:51 ` [PATCH 12/21] perf tools: Add struct parse_args arg to perf_sample__parse Jiri Olsa
2018-01-24 11:51 ` [PATCH 13/21] perf tools: Add support to parse user data event Jiri Olsa
2018-01-24 11:51 ` [PATCH 14/21] perf tools: Add support to dump user data event info Jiri Olsa
2018-01-24 11:51 ` [PATCH 15/21] perf report: Add delayed user data event processing Jiri Olsa
2018-01-24 11:51 ` [PATCH 16/21] perf record: Enable delayed user data events Jiri Olsa
2018-01-24 11:51 ` [PATCH 17/21] perf script: Add support to display " Jiri Olsa
2018-01-24 11:51 ` [PATCH 18/21] perf script: Add support to display user data ID Jiri Olsa
2018-01-24 11:51 ` [PATCH 19/21] perf script: Display USER_DATA misc char for sample Jiri Olsa
2018-01-24 11:51 ` [PATCH 20/21] perf report: Add user data processing stats Jiri Olsa
2018-01-24 11:51 ` [PATCH 21/21] perf report: Add --stats=ud option to display user data debug info Jiri Olsa
2018-01-24 12:11 ` [RFC 00/21] perf tools: Add user data delayed processing 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=20180124115143.14322-5-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=dsahern@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.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