diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2009-06-01 17:50:19 -0300 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-06-02 03:40:52 +0200 |
commit | a0055ae2a4e13db9534c438cf8f3896181da6afc (patch) | |
tree | db47d0a2ad5bbd7c0c27d4e295ca8da68eacb3a2 /Documentation/perf_counter/builtin-record.c | |
parent | ea5cc87c63b49c133d15ec2911bb2e49e8124516 (diff) | |
download | lwn-a0055ae2a4e13db9534c438cf8f3896181da6afc.tar.gz lwn-a0055ae2a4e13db9534c438cf8f3896181da6afc.zip |
perf_counter tools: Use hex2u64 in more places
This has also a nice side effect, tools built on newer systems such as
fedora 10 again work on systems with older versions of glibc:
My workstation:
[acme@doppio ~]$ rpm -q glibc.x86_64
glibc-2.9-3.x86_64
Test machine:
[acme@emilia ~]$ rpm -q glibc.x86_64
glibc-2.5-24
Before:
[acme@emilia ~]$ perf
perf: /lib64/libc.so.6: version `GLIBC_2.7' not found (required by perf)
[acme@emilia ~]$ nm `which perf` | grep GLIBC_2\.7
U __isoc99_sscanf@@GLIBC_2.7
[acme@emilia ~]$
After:
[acme@emilia ~]$ perf
usage: perf [--version] [--help] COMMAND [ARGS]
The most commonly used perf commands are:
record Run a command and record its profile into perf.data
report Read perf.data (created by perf record) and display the
profile
stat Run a command and gather performance counter statistics
top Run a command and profile it
See 'perf help COMMAND' for more information on a specific command.
[acme@emilia ~]$ nm `which perf` | grep GLIBC_2\.7
[acme@emilia ~]$
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <20090601205019.GA7805@ghostprotocols.net>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/perf_counter/builtin-record.c')
-rw-r--r-- | Documentation/perf_counter/builtin-record.c | 56 |
1 files changed, 32 insertions, 24 deletions
diff --git a/Documentation/perf_counter/builtin-record.c b/Documentation/perf_counter/builtin-record.c index 96bfb7c5f1e4..9c151ded22fa 100644 --- a/Documentation/perf_counter/builtin-record.c +++ b/Documentation/perf_counter/builtin-record.c @@ -5,6 +5,7 @@ #include "util/util.h" #include "util/parse-options.h" #include "util/parse-events.h" +#include "util/string.h" #include <sched.h> @@ -165,12 +166,10 @@ static pid_t pid_synthesize_comm_event(pid_t pid) { struct comm_event comm_ev; char filename[PATH_MAX]; - pid_t spid, ppid; char bf[BUFSIZ]; - int fd, nr, ret; - char comm[18]; + int fd, ret; size_t size; - char state; + char *field, *sep; snprintf(filename, sizeof(filename), "/proc/%d/stat", pid); @@ -185,20 +184,22 @@ static pid_t pid_synthesize_comm_event(pid_t pid) } close(fd); + /* 9027 (cat) R 6747 9027 6747 34816 9027 ... */ memset(&comm_ev, 0, sizeof(comm_ev)); - nr = sscanf(bf, "%d %s %c %d %d ", - &spid, comm, &state, &ppid, &comm_ev.pid); - if (nr != 5) { - fprintf(stderr, "couldn't get COMM and pgid, malformed %s\n", - filename); - exit(EXIT_FAILURE); - } + field = strchr(bf, '('); + if (field == NULL) + goto out_failure; + sep = strchr(++field, ')'); + if (sep == NULL) + goto out_failure; + size = sep - field; + memcpy(comm_ev.comm, field, size++); + field = strchr(sep + 4, ' '); + if (field == NULL) + goto out_failure; + comm_ev.pid = atoi(++field); comm_ev.header.type = PERF_EVENT_COMM; comm_ev.tid = pid; - size = strlen(comm); - comm[--size] = '\0'; /* Remove the ')' at the end */ - --size; /* Remove the '(' at the begin */ - memcpy(comm_ev.comm, comm + 1, size); size = ALIGN(size, sizeof(uint64_t)); comm_ev.header.size = sizeof(comm_ev) - (sizeof(comm_ev.comm) - size); @@ -208,6 +209,11 @@ static pid_t pid_synthesize_comm_event(pid_t pid) exit(-1); } return comm_ev.pid; +out_failure: + fprintf(stderr, "couldn't get COMM and pgid, malformed %s\n", + filename); + exit(EXIT_FAILURE); + return -1; } static void pid_synthesize_mmap_events(pid_t pid, pid_t pgid) @@ -223,23 +229,25 @@ static void pid_synthesize_mmap_events(pid_t pid, pid_t pgid) exit(EXIT_FAILURE); } while (1) { - char bf[BUFSIZ]; - unsigned char vm_read, vm_write, vm_exec, vm_mayshare; + char bf[BUFSIZ], *pbf = bf; struct mmap_event mmap_ev = { .header.type = PERF_EVENT_MMAP, }; - unsigned long ino; - int major, minor; + int n; size_t size; if (fgets(bf, sizeof(bf), fp) == NULL) break; /* 00400000-0040c000 r-xp 00000000 fd:01 41038 /bin/cat */ - sscanf(bf, "%llx-%llx %c%c%c%c %llx %x:%x %lu", - &mmap_ev.start, &mmap_ev.len, - &vm_read, &vm_write, &vm_exec, &vm_mayshare, - &mmap_ev.pgoff, &major, &minor, &ino); - if (vm_exec == 'x') { + n = hex2u64(pbf, &mmap_ev.start); + if (n < 0) + continue; + pbf += n + 1; + n = hex2u64(pbf, &mmap_ev.len); + if (n < 0) + continue; + pbf += n + 3; + if (*pbf == 'x') { /* vm_exec */ char *execname = strrchr(bf, ' '); if (execname == NULL || execname[1] != '/') |