perf tools: Use sscanf for parsing /proc/pid/maps

When reading those files to synthesize MMAP events.  It makes the code
shorter and cleaner.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1352643651-13891-1-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index ca9ca285406a8651a5027edf55bd5c21efa67944..3cf2c3e0605f249543c11ddbe2c39cb2607a6f7a 100644 (file)
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -193,55 +193,43 @@ static int perf_event__synthesize_mmap_events(struct perf_tool *tool,
        event->header.misc = PERF_RECORD_MISC_USER;
 
        while (1) {
-               char bf[BUFSIZ], *pbf = bf;
-               int n;
+               char bf[BUFSIZ];
+               char prot[5];
+               char execname[PATH_MAX];
+               char anonstr[] = "//anon";
                size_t size;
+
                if (fgets(bf, sizeof(bf), fp) == NULL)
                        break;
 
+               /* ensure null termination since stack will be reused. */
+               strcpy(execname, "");
+
                /* 00400000-0040c000 r-xp 00000000 fd:01 41038  /bin/cat */
-               n = hex2u64(pbf, &event->mmap.start);
-               if (n < 0)
-                       continue;
-               pbf += n + 1;
-               n = hex2u64(pbf, &event->mmap.len);
-               if (n < 0)
+               sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %*x:%*x %*u %s\n",
+                      &event->mmap.start, &event->mmap.len, prot,
+                      &event->mmap.pgoff, execname);
+
+               if (prot[2] != 'x')
                        continue;
-               pbf += n + 3;
-               if (*pbf == 'x') { /* vm_exec */
-                       char anonstr[] = "//anon\n";
-                       char *execname = strchr(bf, '/');
-
-                       /* Catch VDSO */
-                       if (execname == NULL)
-                               execname = strstr(bf, "[vdso]");
-
-                       /* Catch anonymous mmaps */
-                       if ((execname == NULL) && !strstr(bf, "["))
-                               execname = anonstr;
-
-                       if (execname == NULL)
-                               continue;
-
-                       pbf += 3;
-                       n = hex2u64(pbf, &event->mmap.pgoff);
-
-                       size = strlen(execname);
-                       execname[size - 1] = '\0'; /* Remove \n */
-                       memcpy(event->mmap.filename, execname, size);
-                       size = PERF_ALIGN(size, sizeof(u64));
-                       event->mmap.len -= event->mmap.start;
-                       event->mmap.header.size = (sizeof(event->mmap) -
-                                               (sizeof(event->mmap.filename) - size));
-                       memset(event->mmap.filename + size, 0, machine->id_hdr_size);
-                       event->mmap.header.size += machine->id_hdr_size;
-                       event->mmap.pid = tgid;
-                       event->mmap.tid = pid;
-
-                       if (process(tool, event, &synth_sample, machine) != 0) {
-                               rc = -1;
-                               break;
-                       }
+
+               if (!strcmp(execname, ""))
+                       strcpy(execname, anonstr);
+
+               size = strlen(execname) + 1;
+               memcpy(event->mmap.filename, execname, size);
+               size = PERF_ALIGN(size, sizeof(u64));
+               event->mmap.len -= event->mmap.start;
+               event->mmap.header.size = (sizeof(event->mmap) -
+                                          (sizeof(event->mmap.filename) - size));
+               memset(event->mmap.filename + size, 0, machine->id_hdr_size);
+               event->mmap.header.size += machine->id_hdr_size;
+               event->mmap.pid = tgid;
+               event->mmap.tid = pid;
+
+               if (process(tool, event, &synth_sample, machine) != 0) {
+                       rc = -1;
+                       break;
                }
        }