Merge tag 'perf-core-for-mingo-20160823' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

User visible changes:

. Allow configuring the default 'perf report -s' sort order in ~/.perfconfig,
  for instance, "sym,dso" may be more fitting for kernel developers. (Arnaldo Carvalho de Melo)

- Support x8/x16/x32/x64 hexadecimal "types" in ftrace and 'perf probe' (Masami Hiramatsu)

Infrastructure changes:

- Skip running the feature tests for 'make install-doc' (Rui Teng)

- Introduce tools/include/linux/time64.h with *SEC_PER_*SEC macros
  to use in all of tools/ (Arnaldo Carvalho de Melo)

- Break down symbol__disassemble() into multiple functions, to ease
  future work on better reporting the errors that may take place in
  the various steps it performs (possibly decompressing kernel module
  files, getting build-id keyed files, calling objdump, parsing its
  output, etc) (Arnaldo Carvalho de Melo)

- Typo fixes in various places (Colin Ian King)

- Remove superfluous NULL check in the TUI code (Colin Ian King)

- Allow displaying multiple header lines in the TUI browser, prep
  work for the 'perf c2c' browser (Jiri Olsa)

- Copy coresight-pmu.h header file needed by perf tools (Mathieu Poirier)

- Use __weak definition from linux/compiler.h (Rui Teng)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 44 insertions, 43 deletions

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 4024d309bb00..25a9259a6a6e 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1162,53 +1162,60 @@ int symbol__strerror_disassemble(struct symbol *sym __maybe_unused, struct map *
         return 0;
 }
 
-int symbol__disassemble(struct symbol *sym, struct map *map, size_t privsize)
+static int dso__disassemble_filename(struct dso *dso, char *filename, size_t filename_size)
 {
-        struct dso *dso = map->dso;
-        char *filename = dso__build_id_filename(dso, NULL, 0);
-        bool free_filename = true;
-        char command[PATH_MAX * 2];
-        FILE *file;
-        int err = 0;
-        char symfs_filename[PATH_MAX];
-        struct kcore_extract kce;
-        bool delete_extract = false;
-        int stdout_fd[2];
-        int lineno = 0;
-        int nline;
-        pid_t pid;
+        char linkname[PATH_MAX];
+        char *build_id_filename;
 
-        if (filename)
-                symbol__join_symfs(symfs_filename, filename);
+        if (dso->symtab_type == DSO_BINARY_TYPE__KALLSYMS &&
+            !dso__is_kcore(dso))
+                return SYMBOL_ANNOTATE_ERRNO__NO_VMLINUX;
 
-        if (filename == NULL) {
+        build_id_filename = dso__build_id_filename(dso, NULL, 0);
+        if (build_id_filename) {
+                __symbol__join_symfs(filename, filename_size, build_id_filename);
+                free(build_id_filename);
+        } else {
                 if (dso->has_build_id)
                         return ENOMEM;
                 goto fallback;
-        } else if (dso__is_kcore(dso) ||
-                   readlink(symfs_filename, command, sizeof(command)) < 0 ||
-                   strstr(command, DSO__NAME_KALLSYMS) ||
-                   access(symfs_filename, R_OK)) {
-                free(filename);
+        }
+
+        if (dso__is_kcore(dso) ||
+            readlink(filename, linkname, sizeof(linkname)) < 0 ||
+            strstr(linkname, DSO__NAME_KALLSYMS) ||
+            access(filename, R_OK)) {
 fallback:
                 /*
                  * If we don't have build-ids or the build-id file isn't in the
                  * cache, or is just a kallsyms file, well, lets hope that this
                  * DSO is the same as when 'perf record' ran.
                  */
-                filename = (char *)dso->long_name;
-                symbol__join_symfs(symfs_filename, filename);
-                free_filename = false;
+                __symbol__join_symfs(filename, filename_size, dso->long_name);
         }
 
-        if (dso->symtab_type == DSO_BINARY_TYPE__KALLSYMS &&
-            !dso__is_kcore(dso)) {
-                err = SYMBOL_ANNOTATE_ERRNO__NO_VMLINUX;
-                goto out_free_filename;
-        }
+        return 0;
+}
+
+int symbol__disassemble(struct symbol *sym, struct map *map, size_t privsize)
+{
+        struct dso *dso = map->dso;
+        char command[PATH_MAX * 2];
+        FILE *file;
+        char symfs_filename[PATH_MAX];
+        struct kcore_extract kce;
+        bool delete_extract = false;
+        int stdout_fd[2];
+        int lineno = 0;
+        int nline;
+        pid_t pid;
+        int err = dso__disassemble_filename(dso, symfs_filename, sizeof(symfs_filename));
+
+        if (err)
+                return err;
 
         pr_debug("%s: filename=%s, sym=%s, start=%#" PRIx64 ", end=%#" PRIx64 "\n", __func__,
-                 filename, sym->name, map->unmap_ip(map, sym->start),
+                 symfs_filename, sym->name, map->unmap_ip(map, sym->start),
                  map->unmap_ip(map, sym->end));
 
         pr_debug("annotating [%p] %30s : [%p] %30s\n",
@@ -1223,11 +1230,6 @@ fallback:
                         delete_extract = true;
                         strlcpy(symfs_filename, kce.extract_filename,
                                 sizeof(symfs_filename));
-                        if (free_filename) {
-                                free(filename);
-                                free_filename = false;
-                        }
-                        filename = symfs_filename;
                 }
         } else if (dso__needs_decompress(dso)) {
                 char tmp[PATH_MAX];
@@ -1236,14 +1238,14 @@ fallback:
                 bool ret;
 
                 if (kmod_path__parse_ext(&m, symfs_filename))
-                        goto out_free_filename;
+                        goto out;
 
                 snprintf(tmp, PATH_MAX, "/tmp/perf-kmod-XXXXXX");
 
                 fd = mkstemp(tmp);
                 if (fd < 0) {
                         free(m.ext);
-                        goto out_free_filename;
+                        goto out;
                 }
 
                 ret = decompress_to_file(m.ext, symfs_filename, fd);
@@ -1255,7 +1257,7 @@ fallback:
                 close(fd);
 
                 if (!ret)
-                        goto out_free_filename;
+                        goto out;
 
                 strcpy(symfs_filename, tmp);
         }
@@ -1271,7 +1273,7 @@ fallback:
                  map__rip_2objdump(map, sym->end),
                  symbol_conf.annotate_asm_raw ? "" : "--no-show-raw",
                  symbol_conf.annotate_src ? "-S" : "",
-                 symfs_filename, filename);
+                 symfs_filename, symfs_filename);
 
         pr_debug("Executing: %s\n", command);
 
@@ -1333,11 +1335,10 @@ out_remove_tmp:
 
         if (dso__needs_decompress(dso))
                 unlink(symfs_filename);
-out_free_filename:
+
         if (delete_extract)
                 kcore_extract__delete(&kce);
-        if (free_filename)
-                free(filename);
+out:
         return err;
 
 out_close_stdout: