[tip:perfcounters/core] perf record/report: Fix PID/COMM handling

From: tip-bot for Ingo Molnar
Date: Thu Jun 04 2009 - 08:49:37 EST


Commit-ID: df97992c6e25ffc66c549c8bc59262dc627c6d17
Gitweb: http://git.kernel.org/tip/df97992c6e25ffc66c549c8bc59262dc627c6d17
Author: Ingo Molnar <mingo@xxxxxxx>
AuthorDate: Thu, 4 Jun 2009 13:41:22 +0200
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Thu, 4 Jun 2009 13:41:37 +0200

perf record/report: Fix PID/COMM handling

Fix two bugs causing lost comm mappings:

- initial PID is not 0 but getpid()

- when we are unable to handle an mmap event, dont assume the event
itself is broken - try to parse the stream. This way we wont lose
comm events.

Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Corey Ashford <cjashfor@xxxxxxxxxxxxxxxxxx>
Cc: Marcelo Tosatti <mtosatti@xxxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>


---
Documentation/perf_counter/builtin-record.c | 2 +-
Documentation/perf_counter/builtin-report.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/perf_counter/builtin-record.c b/Documentation/perf_counter/builtin-record.c
index efa2eb4..bf59df5 100644
--- a/Documentation/perf_counter/builtin-record.c
+++ b/Documentation/perf_counter/builtin-record.c
@@ -430,7 +430,7 @@ static int __cmd_record(int argc, const char **argv)
}

if (!system_wide) {
- open_counters(-1, target_pid != -1 ? target_pid : 0);
+ open_counters(-1, target_pid != -1 ? target_pid : getpid());
} else for (i = 0; i < nr_cpus; i++)
open_counters(i, target_pid);

diff --git a/Documentation/perf_counter/builtin-report.c b/Documentation/perf_counter/builtin-report.c
index 86f23f0..ff6f657 100644
--- a/Documentation/perf_counter/builtin-report.c
+++ b/Documentation/perf_counter/builtin-report.c
@@ -852,7 +852,7 @@ process_mmap_event(event_t *event, unsigned long offset, unsigned long head)

if (thread == NULL || map == NULL) {
dprintf("problem processing PERF_EVENT_MMAP, skipping event.\n");
- return -1;
+ return 0;
}

thread__insert_map(thread, map);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/