* [PATCH 1/3] perf script: Move evname print code to process_event()
@ 2013-11-18 3:00 Namhyung Kim
2013-11-18 3:00 ` [RFC/PATCH 2/3] perf script: Print comm, fork and exit events also Namhyung Kim
2013-11-18 3:00 ` [RFC/PATCH 3/3] perf script: Print mmap[2] " Namhyung Kim
0 siblings, 2 replies; 6+ messages in thread
From: Namhyung Kim @ 2013-11-18 3:00 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar, Namhyung Kim, LKML,
Frederic Weisbecker, Jiri Olsa, David Ahern
The print_sample_start() will be reused by other printing routine for
internal events like COMM, FORK and EXIT from next patch. And because
they're not tied to a specific event, move the evname print code to
its caller.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/builtin-script.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index baf17989a216..b392770766dd 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -288,7 +288,6 @@ static void print_sample_start(struct perf_sample *sample,
struct perf_evsel *evsel)
{
struct perf_event_attr *attr = &evsel->attr;
- const char *evname = NULL;
unsigned long secs;
unsigned long usecs;
unsigned long long nsecs;
@@ -323,11 +322,6 @@ static void print_sample_start(struct perf_sample *sample,
usecs = nsecs / NSECS_PER_USEC;
printf("%5lu.%06lu: ", secs, usecs);
}
-
- if (PRINT_FIELD(EVNAME)) {
- evname = perf_evsel__name(evsel);
- printf("%s: ", evname ? evname : "[unknown]");
- }
}
static bool is_bts_event(struct perf_event_attr *attr)
@@ -434,6 +428,11 @@ static void process_event(union perf_event *event, struct perf_sample *sample,
print_sample_start(sample, thread, evsel);
+ if (PRINT_FIELD(EVNAME)) {
+ const char *evname = perf_evsel__name(evsel);
+ printf("%s: ", evname ? evname : "[unknown]");
+ }
+
if (is_bts_event(attr)) {
print_sample_bts(event, sample, evsel, machine, thread);
return;
--
1.7.11.7
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [RFC/PATCH 2/3] perf script: Print comm, fork and exit events also
2013-11-18 3:00 [PATCH 1/3] perf script: Move evname print code to process_event() Namhyung Kim
@ 2013-11-18 3:00 ` Namhyung Kim
2013-11-18 4:44 ` David Ahern
2013-11-18 3:00 ` [RFC/PATCH 3/3] perf script: Print mmap[2] " Namhyung Kim
1 sibling, 1 reply; 6+ messages in thread
From: Namhyung Kim @ 2013-11-18 3:00 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar, Namhyung Kim, LKML,
Frederic Weisbecker, Jiri Olsa, David Ahern
If --show-task option is given, also print internal COMM, FORK and
EXIT events. It would be helpful for debugging.
Suggested-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/Documentation/perf-script.txt | 3 +
tools/perf/builtin-script.c | 110 +++++++++++++++++++++++++++++++
2 files changed, 113 insertions(+)
diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Documentation/perf-script.txt
index e9cbfcddfa3f..9a9a7c3d592d 100644
--- a/tools/perf/Documentation/perf-script.txt
+++ b/tools/perf/Documentation/perf-script.txt
@@ -203,6 +203,9 @@ OPTIONS
--show-kernel-path::
Try to resolve the path of [kernel.kallsyms]
+--show-task
+ Display task related events (e.g. FORK, COMM, EXIT).
+
SEE ALSO
--------
linkperf:perf-record[1], linkperf:perf-script-perl[1],
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index b392770766dd..bc4cbb8b8867 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -548,6 +548,7 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused,
struct perf_script {
struct perf_tool tool;
struct perf_session *session;
+ bool show_task_events;
};
static int process_attr(struct perf_tool *tool, union perf_event *event,
@@ -578,6 +579,106 @@ static int process_attr(struct perf_tool *tool, union perf_event *event,
return perf_evsel__check_attr(evsel, scr->session);
}
+static int process_comm_event(struct perf_tool *tool,
+ union perf_event *event,
+ struct perf_sample *sample,
+ struct machine *machine)
+{
+ struct thread *thread;
+ struct perf_script *script = container_of(tool, struct perf_script, tool);
+ struct perf_session *session = script->session;
+ struct perf_evsel *evsel = perf_evlist__first(session->evlist);
+ char *oldname;
+
+ thread = machine__findnew_thread(machine, event->comm.pid, event->comm.tid);
+ if (thread == NULL) {
+ pr_debug("problem processing COMM event, skipping it.\n");
+ return -1;
+ }
+
+ oldname = strdup(thread__comm_str(thread));
+ if (oldname == NULL) {
+ pr_debug("problem processing COMM event, skipping it.\n");
+ return -1;
+ }
+
+ if (perf_event__process_comm(tool, event, sample, machine) < 0)
+ return -1;
+
+ if (!evsel->attr.sample_id_all) {
+ sample->cpu = 0;
+ sample->time = 0;
+ sample->tid = event->comm.tid;
+ sample->pid = event->comm.pid;
+ }
+ print_sample_start(sample, thread, evsel);
+ printf("comm: %s --> %s\n", oldname, event->comm.comm);
+
+ return 0;
+}
+
+static int process_fork_event(struct perf_tool *tool,
+ union perf_event *event,
+ struct perf_sample *sample,
+ struct machine *machine)
+{
+ struct thread *thread;
+ struct perf_script *script = container_of(tool, struct perf_script, tool);
+ struct perf_session *session = script->session;
+ struct perf_evsel *evsel = perf_evlist__first(session->evlist);
+
+ if (perf_event__process_fork(tool, event, sample, machine) < 0)
+ return -1;
+
+ thread = machine__findnew_thread(machine, event->fork.pid, event->fork.tid);
+ if (thread == NULL) {
+ pr_debug("problem processing FORK event, skipping it.\n");
+ return -1;
+ }
+
+ if (!evsel->attr.sample_id_all) {
+ sample->cpu = 0;
+ sample->time = event->fork.time;
+ sample->tid = event->fork.tid;
+ sample->pid = event->fork.pid;
+ }
+ print_sample_start(sample, thread, evsel);
+ printf("fork: %s (%d --> %d)\n", thread__comm_str(thread),
+ event->fork.ptid, event->fork.tid);
+
+ return 0;
+}
+static int process_exit_event(struct perf_tool *tool,
+ union perf_event *event,
+ struct perf_sample *sample,
+ struct machine *machine)
+{
+ struct thread *thread;
+ struct perf_script *script = container_of(tool, struct perf_script, tool);
+ struct perf_session *session = script->session;
+ struct perf_evsel *evsel = perf_evlist__first(session->evlist);
+
+ thread = machine__findnew_thread(machine, event->fork.pid, event->fork.tid);
+ if (thread == NULL) {
+ pr_debug("problem processing EXIT event, skipping it.\n");
+ return -1;
+ }
+
+ if (!evsel->attr.sample_id_all) {
+ sample->cpu = 0;
+ sample->time = 0;
+ sample->tid = event->comm.tid;
+ sample->pid = event->comm.pid;
+ }
+ print_sample_start(sample, thread, evsel);
+ printf("exit: %s (%d)\n", thread__comm_str(thread), event->fork.tid);
+
+ if (perf_event__process_exit(tool, event, sample, machine) < 0)
+ return -1;
+
+ return 0;
+}
+
static void sig_handler(int sig __maybe_unused)
{
session_done = 1;
@@ -589,6 +690,13 @@ static int __cmd_script(struct perf_script *script)
signal(SIGINT, sig_handler);
+ /* override event processing functions */
+ if (script->show_task_events) {
+ script->tool.comm = process_comm_event;
+ script->tool.fork = process_fork_event;
+ script->tool.exit = process_exit_event;
+ }
+
ret = perf_session__process_events(script->session, &script->tool);
if (debug_mode)
@@ -1351,6 +1459,8 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused)
"display extended information from perf.data file"),
OPT_BOOLEAN('\0', "show-kernel-path", &symbol_conf.show_kernel_path,
"Show the path of [kernel.kallsyms]"),
+ OPT_BOOLEAN('\0', "show-task", &script.show_task_events,
+ "Show the fork/comm/exit events"),
OPT_END()
};
const char * const script_usage[] = {
--
1.7.11.7
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [RFC/PATCH 3/3] perf script: Print mmap[2] events also
2013-11-18 3:00 [PATCH 1/3] perf script: Move evname print code to process_event() Namhyung Kim
2013-11-18 3:00 ` [RFC/PATCH 2/3] perf script: Print comm, fork and exit events also Namhyung Kim
@ 2013-11-18 3:00 ` Namhyung Kim
2013-11-18 4:47 ` David Ahern
1 sibling, 1 reply; 6+ messages in thread
From: Namhyung Kim @ 2013-11-18 3:00 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar, Namhyung Kim, LKML,
Frederic Weisbecker, Jiri Olsa, David Ahern
If --show-mmap option is given, also print internal MMAP and MMAP2
events. It would be helpful for debugging.
Suggested-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/Documentation/perf-script.txt | 3 ++
tools/perf/builtin-script.c | 78 ++++++++++++++++++++++++++++++++
2 files changed, 81 insertions(+)
diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Documentation/perf-script.txt
index 9a9a7c3d592d..ad67f3b0efda 100644
--- a/tools/perf/Documentation/perf-script.txt
+++ b/tools/perf/Documentation/perf-script.txt
@@ -206,6 +206,9 @@ OPTIONS
--show-task
Display task related events (e.g. FORK, COMM, EXIT).
+--show-mmap
+ Display mmap related events (e.g. MMAP, MMAP2).
+
SEE ALSO
--------
linkperf:perf-record[1], linkperf:perf-script-perl[1],
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index bc4cbb8b8867..4b88bdb936b4 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -549,6 +549,7 @@ struct perf_script {
struct perf_tool tool;
struct perf_session *session;
bool show_task_events;
+ bool show_mmap_events;
};
static int process_attr(struct perf_tool *tool, union perf_event *event,
@@ -679,6 +680,77 @@ static int process_exit_event(struct perf_tool *tool,
return 0;
}
+static int process_mmap_event(struct perf_tool *tool,
+ union perf_event *event,
+ struct perf_sample *sample,
+ struct machine *machine)
+{
+ struct thread *thread;
+ struct perf_script *script = container_of(tool, struct perf_script, tool);
+ struct perf_session *session = script->session;
+ struct perf_evsel *evsel = perf_evlist__first(session->evlist);
+
+ if (perf_event__process_mmap(tool, event, sample, machine) < 0)
+ return -1;
+
+ thread = machine__findnew_thread(machine, event->mmap.pid, event->mmap.tid);
+ if (thread == NULL) {
+ pr_debug("problem processing MMAP event, skipping it.\n");
+ return -1;
+ }
+
+ if (!evsel->attr.sample_id_all) {
+ sample->cpu = 0;
+ sample->time = 0;
+ sample->tid = event->comm.tid;
+ sample->pid = event->comm.pid;
+ }
+ print_sample_start(sample, thread, evsel);
+ printf("mmap: [(%#"PRIx64" - %#"PRIx64") @ %#"PRIx64" ]: %c %s\n",
+ event->mmap.start, event->mmap.start + event->mmap.len,
+ event->mmap.pgoff,
+ (event->header.misc & PERF_RECORD_MISC_MMAP_DATA) ? 'r' : 'x',
+ event->mmap.filename);
+
+ return 0;
+}
+
+static int process_mmap2_event(struct perf_tool *tool,
+ union perf_event *event,
+ struct perf_sample *sample,
+ struct machine *machine)
+{
+ struct thread *thread;
+ struct perf_script *script = container_of(tool, struct perf_script, tool);
+ struct perf_session *session = script->session;
+ struct perf_evsel *evsel = perf_evlist__first(session->evlist);
+
+ if (perf_event__process_mmap2(tool, event, sample, machine) < 0)
+ return -1;
+
+ thread = machine__findnew_thread(machine, event->mmap2.pid, event->mmap2.tid);
+ if (thread == NULL) {
+ pr_debug("problem processing MMAP2 event, skipping it.\n");
+ return -1;
+ }
+
+ if (!evsel->attr.sample_id_all) {
+ sample->cpu = 0;
+ sample->time = 0;
+ sample->tid = event->mmap2.tid;
+ sample->pid = event->mmap2.pid;
+ }
+ print_sample_start(sample, thread, evsel);
+ printf("mmap: [(%#"PRIx64" - %#"PRIx64") @ %#"PRIx64" %02x:%02x %"PRIu64"]: %c %s\n",
+ event->mmap2.start, event->mmap2.start + event->mmap2.len,
+ event->mmap2.pgoff, event->mmap2.maj, event->mmap2.min,
+ event->mmap2.ino,
+ (event->header.misc & PERF_RECORD_MISC_MMAP_DATA) ? 'r' : 'x',
+ event->mmap2.filename);
+
+ return 0;
+}
+
static void sig_handler(int sig __maybe_unused)
{
session_done = 1;
@@ -696,6 +768,10 @@ static int __cmd_script(struct perf_script *script)
script->tool.fork = process_fork_event;
script->tool.exit = process_exit_event;
}
+ if (script->show_mmap_events) {
+ script->tool.mmap = process_mmap_event;
+ script->tool.mmap2 = process_mmap2_event;
+ }
ret = perf_session__process_events(script->session, &script->tool);
@@ -1461,6 +1537,8 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused)
"Show the path of [kernel.kallsyms]"),
OPT_BOOLEAN('\0', "show-task", &script.show_task_events,
"Show the fork/comm/exit events"),
+ OPT_BOOLEAN('\0', "show-mmap", &script.show_mmap_events,
+ "Show the mmap events"),
OPT_END()
};
const char * const script_usage[] = {
--
1.7.11.7
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [RFC/PATCH 2/3] perf script: Print comm, fork and exit events also
2013-11-18 3:00 ` [RFC/PATCH 2/3] perf script: Print comm, fork and exit events also Namhyung Kim
@ 2013-11-18 4:44 ` David Ahern
0 siblings, 0 replies; 6+ messages in thread
From: David Ahern @ 2013-11-18 4:44 UTC (permalink / raw)
To: Namhyung Kim, Arnaldo Carvalho de Melo
Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar, Namhyung Kim, LKML,
Frederic Weisbecker, Jiri Olsa
On 11/17/13, 8:00 PM, Namhyung Kim wrote:
> @@ -578,6 +579,106 @@ static int process_attr(struct perf_tool *tool, union perf_event *event,
> return perf_evsel__check_attr(evsel, scr->session);
> }
>
> +static int process_comm_event(struct perf_tool *tool,
> + union perf_event *event,
> + struct perf_sample *sample,
> + struct machine *machine)
> +{
> + struct thread *thread;
> + struct perf_script *script = container_of(tool, struct perf_script, tool);
> + struct perf_session *session = script->session;
> + struct perf_evsel *evsel = perf_evlist__first(session->evlist);
> + char *oldname;
> +
> + thread = machine__findnew_thread(machine, event->comm.pid, event->comm.tid);
> + if (thread == NULL) {
> + pr_debug("problem processing COMM event, skipping it.\n");
> + return -1;
> + }
> +
> + oldname = strdup(thread__comm_str(thread));
> + if (oldname == NULL) {
> + pr_debug("problem processing COMM event, skipping it.\n");
> + return -1;
> + }
> +
> + if (perf_event__process_comm(tool, event, sample, machine) < 0)
> + return -1;
> +
> + if (!evsel->attr.sample_id_all) {
> + sample->cpu = 0;
> + sample->time = 0;
> + sample->tid = event->comm.tid;
> + sample->pid = event->comm.pid;
> + }
> + print_sample_start(sample, thread, evsel);
> + printf("comm: %s --> %s\n", oldname, event->comm.comm);
free(oldname)
David
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RFC/PATCH 3/3] perf script: Print mmap[2] events also
2013-11-18 3:00 ` [RFC/PATCH 3/3] perf script: Print mmap[2] " Namhyung Kim
@ 2013-11-18 4:47 ` David Ahern
2013-11-18 5:18 ` Namhyung Kim
0 siblings, 1 reply; 6+ messages in thread
From: David Ahern @ 2013-11-18 4:47 UTC (permalink / raw)
To: Namhyung Kim, Arnaldo Carvalho de Melo
Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar, Namhyung Kim, LKML,
Frederic Weisbecker, Jiri Olsa
On 11/17/13, 8:00 PM, Namhyung Kim wrote:
> If --show-mmap option is given, also print internal MMAP and MMAP2
> events. It would be helpful for debugging.
>
> Suggested-by: Frederic Weisbecker <fweisbec@gmail.com>
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Outside of the free following a strdup, the 3 patches looked good to me.
Procrastination worked in my favor. Once these go in I'll do the move to
perf-dump.
For all 3:
Reviewed-by: David Ahern <dsahern@gmail.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RFC/PATCH 3/3] perf script: Print mmap[2] events also
2013-11-18 4:47 ` David Ahern
@ 2013-11-18 5:18 ` Namhyung Kim
0 siblings, 0 replies; 6+ messages in thread
From: Namhyung Kim @ 2013-11-18 5:18 UTC (permalink / raw)
To: David Ahern
Cc: Arnaldo Carvalho de Melo, Peter Zijlstra, Paul Mackerras,
Ingo Molnar, Namhyung Kim, LKML, Frederic Weisbecker, Jiri Olsa
Hi David,
On Sun, 17 Nov 2013 21:47:59 -0700, David Ahern wrote:
> On 11/17/13, 8:00 PM, Namhyung Kim wrote:
>> If --show-mmap option is given, also print internal MMAP and MMAP2
>> events. It would be helpful for debugging.
>>
>> Suggested-by: Frederic Weisbecker <fweisbec@gmail.com>
>> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
>
> Outside of the free following a strdup, the 3 patches looked good to
> me. Procrastination worked in my favor. Once these go in I'll do the
> move to perf-dump.
>
> For all 3:
> Reviewed-by: David Ahern <dsahern@gmail.com>
Thank you for quick review!
I'll fix the bug you mentioned and resend.
Thanks,
Namhyung
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-11-18 5:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-18 3:00 [PATCH 1/3] perf script: Move evname print code to process_event() Namhyung Kim
2013-11-18 3:00 ` [RFC/PATCH 2/3] perf script: Print comm, fork and exit events also Namhyung Kim
2013-11-18 4:44 ` David Ahern
2013-11-18 3:00 ` [RFC/PATCH 3/3] perf script: Print mmap[2] " Namhyung Kim
2013-11-18 4:47 ` David Ahern
2013-11-18 5:18 ` Namhyung Kim
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).