From: Adrian Hunter <adrian.hunter@intel.com>
To: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
Ingo Molnar <mingo@redhat.com>,
linux-kernel@vger.kernel.org, David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Jiri Olsa <jolsa@redhat.com>, Mike Galbraith <efault@gmx.de>,
Namhyung Kim <namhyung@gmail.com>,
Paul Mackerras <paulus@samba.org>,
Stephane Eranian <eranian@google.com>
Subject: [PATCH V2 03/14] perf script: Make perf_script a local variable
Date: Tue, 22 Oct 2013 10:34:07 +0300 [thread overview]
Message-ID: <1382427258-17495-4-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1382427258-17495-1-git-send-email-adrian.hunter@intel.com>
Change perf_script from being global to being local.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
tools/perf/builtin-script.c | 40 ++++++++++++++++++++++++----------------
1 file changed, 24 insertions(+), 16 deletions(-)
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 27de606..0c50e4ae 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -542,18 +542,9 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused,
return 0;
}
-static struct perf_tool perf_script = {
- .sample = process_sample_event,
- .mmap = perf_event__process_mmap,
- .mmap2 = perf_event__process_mmap2,
- .comm = perf_event__process_comm,
- .exit = perf_event__process_exit,
- .fork = perf_event__process_fork,
- .attr = perf_event__process_attr,
- .tracing_data = perf_event__process_tracing_data,
- .build_id = perf_event__process_build_id,
- .ordered_samples = true,
- .ordering_requires_timestamps = true,
+struct perf_script {
+ struct perf_tool tool;
+ struct perf_session *session;
};
static void sig_handler(int sig __maybe_unused)
@@ -561,13 +552,13 @@ static void sig_handler(int sig __maybe_unused)
session_done = 1;
}
-static int __cmd_script(struct perf_session *session)
+static int __cmd_script(struct perf_script *scr)
{
int ret;
signal(SIGINT, sig_handler);
- ret = perf_session__process_events(session, &perf_script);
+ ret = perf_session__process_events(scr->session, &scr->tool);
if (debug_mode)
pr_err("Misordered timestamps: %" PRIu64 "\n", nr_unordered);
@@ -1273,6 +1264,21 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused)
char *script_path = NULL;
const char **__argv;
int i, j, err;
+ struct perf_script perf_script = {
+ .tool = {
+ .sample = process_sample_event,
+ .mmap = perf_event__process_mmap,
+ .mmap2 = perf_event__process_mmap2,
+ .comm = perf_event__process_comm,
+ .exit = perf_event__process_exit,
+ .fork = perf_event__process_fork,
+ .attr = perf_event__process_attr,
+ .tracing_data = perf_event__process_tracing_data,
+ .build_id = perf_event__process_build_id,
+ .ordered_samples = true,
+ .ordering_requires_timestamps = true,
+ },
+ };
const struct option options[] = {
OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,
"dump raw trace in ASCII"),
@@ -1498,10 +1504,12 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused)
if (!script_name)
setup_pager();
- session = perf_session__new(&file, false, &perf_script);
+ session = perf_session__new(&file, false, &perf_script.tool);
if (session == NULL)
return -ENOMEM;
+ perf_script.session = session;
+
if (cpu_list) {
if (perf_session__cpu_bitmap(session, cpu_list, cpu_bitmap))
return -1;
@@ -1565,7 +1573,7 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused)
if (err < 0)
goto out;
- err = __cmd_script(session);
+ err = __cmd_script(&perf_script);
perf_session__delete(session);
cleanup_scripting();
--
1.7.11.7
next prev parent reply other threads:[~2013-10-22 7:35 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-22 7:34 [PATCH V2 00/14] perf tools: fixes and tweaks Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 01/14] perf tools: Fix non-debug build Adrian Hunter
2013-10-25 10:32 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 02/14] perf evsel: Add a debug print if perf_event_open fails Adrian Hunter
2013-10-22 7:34 ` Adrian Hunter [this message]
2013-10-23 5:55 ` [PATCH V2 03/14] perf script: Make perf_script a local variable David Ahern
2013-10-25 10:32 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 04/14] perf script: Set up output options for in-stream attributes Adrian Hunter
2013-10-23 6:15 ` David Ahern
2013-10-23 6:41 ` Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 05/14] perf inject: Do not repipe attributes to a perf.data file Adrian Hunter
2013-10-25 10:32 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 06/14] perf tools: Fix 32-bit cross build Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 07/14] perf tools: Fix libunwind build and feature detection for 32-bit build Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 08/14] perf evlist: Add a debug print if event buffer mmap fails Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 09/14] perf record: Add an option to force per-cpu mmaps Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 10/14] perf tools: Allow non-matching sample types Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 11/14] perf sched: Make struct perf_sched sched a local variable Adrian Hunter
2013-10-23 6:43 ` David Ahern
2013-10-23 13:16 ` Arnaldo Carvalho de Melo
2013-10-25 10:32 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 12/14] perf sched: Fix optimized build time Adrian Hunter
2013-10-23 6:44 ` David Ahern
2013-10-23 13:17 ` Arnaldo Carvalho de Melo
2013-10-25 10:32 ` [tip:perf/core] perf sched: Optimize " tip-bot for Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 13/14] perf tools: Do not accept parse_tag_value() overflow Adrian Hunter
2013-10-25 10:32 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-10-22 7:34 ` [PATCH V2 14/14] perf tools: Validate that mmap_pages is not too big Adrian Hunter
2013-10-25 10:32 ` [tip:perf/core] perf evlist: " tip-bot for Adrian Hunter
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=1382427258-17495-4-git-send-email-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=dsahern@gmail.com \
--cc=efault@gmx.de \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@gmail.com \
--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).