From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Masami Hiramatsu <mhiramat@kernel.org>,
Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>,
Brendan Gregg <brendan.d.gregg@gmail.com>,
Hemant Kumar <hemant@linux.vnet.ibm.com>,
Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 05/19] perf probe: Add perf_probe_event__copy()
Date: Wed, 15 Jun 2016 15:13:14 -0300 [thread overview]
Message-ID: <1466014408-12086-6-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1466014408-12086-1-git-send-email-acme@kernel.org>
From: Masami Hiramatsu <mhiramat@kernel.org>
Add perf_probe_event__copy() to copy perf_probe_event data structure and
sub data structures under given source perf_probe_event.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Hemant Kumar <hemant@linux.vnet.ibm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20160608092940.3116.18034.stgit@devbox
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/probe-event.c | 76 +++++++++++++++++++++++++++++++++++++++++--
tools/perf/util/probe-event.h | 3 ++
2 files changed, 76 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 7ae3dd10f147..84f4b2b32ab7 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -2030,6 +2030,79 @@ void clear_perf_probe_event(struct perf_probe_event *pev)
memset(pev, 0, sizeof(*pev));
}
+#define strdup_or_goto(str, label) \
+({ char *__p = NULL; if (str && !(__p = strdup(str))) goto label; __p; })
+
+static int perf_probe_point__copy(struct perf_probe_point *dst,
+ struct perf_probe_point *src)
+{
+ dst->file = strdup_or_goto(src->file, out_err);
+ dst->function = strdup_or_goto(src->function, out_err);
+ dst->lazy_line = strdup_or_goto(src->lazy_line, out_err);
+ dst->line = src->line;
+ dst->retprobe = src->retprobe;
+ dst->offset = src->offset;
+ return 0;
+
+out_err:
+ clear_perf_probe_point(dst);
+ return -ENOMEM;
+}
+
+static int perf_probe_arg__copy(struct perf_probe_arg *dst,
+ struct perf_probe_arg *src)
+{
+ struct perf_probe_arg_field *field, **ppfield;
+
+ dst->name = strdup_or_goto(src->name, out_err);
+ dst->var = strdup_or_goto(src->var, out_err);
+ dst->type = strdup_or_goto(src->type, out_err);
+
+ field = src->field;
+ ppfield = &(dst->field);
+ while (field) {
+ *ppfield = zalloc(sizeof(*field));
+ if (!*ppfield)
+ goto out_err;
+ (*ppfield)->name = strdup_or_goto(field->name, out_err);
+ (*ppfield)->index = field->index;
+ (*ppfield)->ref = field->ref;
+ field = field->next;
+ ppfield = &((*ppfield)->next);
+ }
+ return 0;
+out_err:
+ return -ENOMEM;
+}
+
+int perf_probe_event__copy(struct perf_probe_event *dst,
+ struct perf_probe_event *src)
+{
+ int i;
+
+ dst->event = strdup_or_goto(src->event, out_err);
+ dst->group = strdup_or_goto(src->group, out_err);
+ dst->target = strdup_or_goto(src->target, out_err);
+ dst->uprobes = src->uprobes;
+
+ if (perf_probe_point__copy(&dst->point, &src->point) < 0)
+ goto out_err;
+
+ dst->args = zalloc(sizeof(struct perf_probe_arg) * src->nargs);
+ if (!dst->args)
+ goto out_err;
+ dst->nargs = src->nargs;
+
+ for (i = 0; i < src->nargs; i++)
+ if (perf_probe_arg__copy(&dst->args[i], &src->args[i]) < 0)
+ goto out_err;
+ return 0;
+
+out_err:
+ clear_perf_probe_event(dst);
+ return -ENOMEM;
+}
+
void clear_probe_trace_event(struct probe_trace_event *tev)
{
struct probe_trace_arg_ref *ref, *next;
@@ -2505,9 +2578,6 @@ static int find_probe_functions(struct map *map, char *name,
return found;
}
-#define strdup_or_goto(str, label) \
- ({ char *__p = strdup(str); if (!__p) goto label; __p; })
-
void __weak arch__fix_tev_from_maps(struct perf_probe_event *pev __maybe_unused,
struct probe_trace_event *tev __maybe_unused,
struct map *map __maybe_unused,
diff --git a/tools/perf/util/probe-event.h b/tools/perf/util/probe-event.h
index 5a27eb4fad05..367f886cfe00 100644
--- a/tools/perf/util/probe-event.h
+++ b/tools/perf/util/probe-event.h
@@ -122,6 +122,9 @@ char *synthesize_perf_probe_command(struct perf_probe_event *pev);
char *synthesize_probe_trace_command(struct probe_trace_event *tev);
char *synthesize_perf_probe_arg(struct perf_probe_arg *pa);
+int perf_probe_event__copy(struct perf_probe_event *dst,
+ struct perf_probe_event *src);
+
/* Check the perf_probe_event needs debuginfo */
bool perf_probe_event_need_dwarf(struct perf_probe_event *pev);
--
2.5.5
next prev parent reply other threads:[~2016-06-15 18:16 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-15 18:13 [GIT PULL 00/19] perf/core improvements and fixes Arnaldo Carvalho de Melo
2016-06-15 18:13 ` [PATCH 01/19] perf config: Handle NULL at perf_config_set__delete() Arnaldo Carvalho de Melo
2016-06-15 18:13 ` [PATCH 02/19] perf tools: Fix rm_rf() to handle non-regular files correctly Arnaldo Carvalho de Melo
2016-06-15 18:13 ` [PATCH 03/19] perf probe: Fix to add NULL check for strndup Arnaldo Carvalho de Melo
2016-06-15 18:13 ` [PATCH 04/19] perf buildid: Rename and export build_id_cache__cachedir() Arnaldo Carvalho de Melo
2016-06-15 18:13 ` Arnaldo Carvalho de Melo [this message]
2016-06-15 18:13 ` [PATCH 06/19] perf probe: Uncomment and export synthesize_perf_probe_point() Arnaldo Carvalho de Melo
2016-06-15 18:13 ` [PATCH 07/19] perf unwind: Fix compile error for static cross build Arnaldo Carvalho de Melo
2016-06-15 18:13 ` [PATCH 08/19] perf mem: Add --ldlat option Arnaldo Carvalho de Melo
2016-06-15 18:13 ` [PATCH 09/19] perf tools: Fix Data Object sort entry width index Arnaldo Carvalho de Melo
2016-06-15 18:13 ` [PATCH 10/19] perf tui: Separate hierarchy and standard headers output Arnaldo Carvalho de Melo
2016-06-15 18:13 ` [PATCH 11/19] perf stdio: Separate " Arnaldo Carvalho de Melo
2016-06-15 18:13 ` [PATCH 12/19] perf stdio: Separate hierarchy " Arnaldo Carvalho de Melo
2016-06-15 18:13 ` [PATCH 13/19] perf stdio: Separate standard " Arnaldo Carvalho de Melo
2016-06-15 18:13 ` [PATCH 14/19] perf stdio: Do not pass hists in hist_entry__fprintf Arnaldo Carvalho de Melo
2016-06-15 18:13 ` [PATCH 15/19] perf stdio: Add use_callchain parameter to hists__fprintf Arnaldo Carvalho de Melo
2016-06-15 18:13 ` [PATCH 16/19] perf hists: Replace perf_evsel arg perf_hpp_fmt's header callback Arnaldo Carvalho de Melo
2016-06-15 18:13 ` [PATCH 17/19] perf hists: Replace perf_evsel arg perf_hpp_fmt's width callback Arnaldo Carvalho de Melo
2016-06-15 18:13 ` [PATCH 18/19] perf probe: Introduce perf_cache interfaces Arnaldo Carvalho de Melo
2016-06-15 18:13 ` [PATCH 19/19] perf probe: Add --cache option to cache the probe definitions Arnaldo Carvalho de Melo
2016-06-16 6:29 ` [GIT PULL 00/19] perf/core improvements and fixes Jiri Olsa
2016-06-16 19:54 ` Arnaldo Carvalho de Melo
2016-06-16 8:29 ` Ingo Molnar
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=1466014408-12086-6-git-send-email-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=ananth@linux.vnet.ibm.com \
--cc=brendan.d.gregg@gmail.com \
--cc=hemant@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.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).