From 100d57ac5957f2d02c3a640ce3fb276697cb21f7 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Thu, 9 Apr 2009 09:50:04 +0200 Subject: [PATCH] --- yaml --- r: 147357 b: refs/heads/master c: b3828ebb3901adfe989d8d4157ed28247aeec132 h: refs/heads/master i: 147355: f6daace87c0d1a3839eba146b820cebacd85012c v: v3 --- [refs] | 2 +- trunk/Documentation/perf_counter/perf-report.cc | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8ed9c17063c1..f8419936aace 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 888fcee066a2f4abd0d0bc9418c0535f9b01e6e5 +refs/heads/master: b3828ebb3901adfe989d8d4157ed28247aeec132 diff --git a/trunk/Documentation/perf_counter/perf-report.cc b/trunk/Documentation/perf_counter/perf-report.cc index 09da0ba482cd..1727317352bf 100644 --- a/trunk/Documentation/perf_counter/perf-report.cc +++ b/trunk/Documentation/perf_counter/perf-report.cc @@ -277,10 +277,17 @@ static std::multimap rev_hist; static std::string resolve_comm(int pid) { - std::string comm = ""; + std::string comm; + std::map::const_iterator ci = comms.find(pid); - if (ci != comms.end()) + if (ci != comms.end()) { comm = ci->second; + } else { + char pid_str[30]; + + sprintf(pid_str, ":%d", pid); + comm = pid_str; + } return comm; } @@ -422,13 +429,13 @@ int main(int argc, char *argv[]) char output[1024]; if (event->header.misc & PERF_EVENT_MISC_KERNEL) { - level = "[kernel]"; + level = " [k] "; sym = resolve_kernel_symbol(event->ip.ip); } else if (event->header.misc & PERF_EVENT_MISC_USER) { - level = "[ user ]"; + level = " [.] "; sym = resolve_user_symbol(event->ip.pid, event->ip.ip); } else { - level = "[ hv ]"; + level = " [H] "; } comm = resolve_comm(event->ip.pid);