perf buildid-cache: Add new buildid cache if update target is not cached

Add new buildid cache if the update target file is not cached.

This can happen when an old binary is replaced by new one after caching
the old one. In this case, user sees his operation just failed.

But it does not look straight, since user just pass the binary "path",
not "build-id".

  ----
  # ./perf buildid-cache --add ./perf
  (update ./perf to new binary)
  # ./perf buildid-cache --update ./perf
  ./perf wasn't in the cache
  #
  ----

This patch adds given new binary to cache if the new binary is
not cached. So we'll not see the above error.

  ----
  # ./perf buildid-cache --add ./perf
  (update ./perf to new binary)
  # ./perf buildid-cache --update ./perf
  #
  ----

Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Hemant Kumar <hemant@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20150226065440.23912.1494.stgit@localhost.localdomain
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/Documentation/perf-buildid-cache.txt b/tools/perf/Documentation/perf-buildid-cache.txt
index 0294c57b1f5ed631534672e6888d280e5c7bc5f3..cec6b57e8be668b47bfd96467fbf6310d8c8a9cc 100644 (file)
--- a/tools/perf/Documentation/perf-buildid-cache.txt
+++ b/tools/perf/Documentation/perf-buildid-cache.txt
@@ -41,9 +41,14 @@ OPTIONS
 --missing=::
        List missing build ids in the cache for the specified file.
 -u::
---update::
-       Update specified file of the cache. It can be used to update kallsyms
-       kernel dso to vmlinux in order to support annotation.
+--update=::
+       Update specified file of the cache. Note that this doesn't remove
+       older entires since those may be still needed for annotating old
+       (or remote) perf.data. Only if there is already a cache which has
+       exactly same build-id, that is replaced by new one. It can be used
+       to update kallsyms and kernel dso to vmlinux in order to support
+       annotation.
+
 -v::
 --verbose::
        Be more verbose.

diff --git a/tools/perf/builtin-buildid-cache.c b/tools/perf/builtin-buildid-cache.c
index d929d95446649d0fcd0d761380040475665b8179..e7568f5844ad45b0e2cd6411d43c0ed93670dcf2 100644 (file)
--- a/tools/perf/builtin-buildid-cache.c
+++ b/tools/perf/builtin-buildid-cache.c
@@ -255,7 +255,7 @@ static int build_id_cache__update_file(const char *filename)
        u8 build_id[BUILD_ID_SIZE];
        char sbuild_id[BUILD_ID_SIZE * 2 + 1];
 
-       int err;
+       int err = 0;
 
        if (filename__read_build_id(filename, &build_id, sizeof(build_id)) < 0) {
                pr_debug("Couldn't read a build-id in %s\n", filename);
@@ -263,7 +263,9 @@ static int build_id_cache__update_file(const char *filename)
        }
 
        build_id__sprintf(build_id, sizeof(build_id), sbuild_id);
-       err = build_id_cache__remove_s(sbuild_id);
+       if (build_id_cache__cached(sbuild_id))
+               err = build_id_cache__remove_s(sbuild_id);
+
        if (!err)
                err = build_id_cache__add_s(sbuild_id, filename, false, false);
 

diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c
index adbc36028636cb55c1cf1160b054e57a24b122f9..0bc33be5a78ccca79bc2d09ff6299e2f048ef233 100644 (file)
--- a/tools/perf/util/build-id.c
+++ b/tools/perf/util/build-id.c
@@ -352,6 +352,18 @@ static int build_id_cache__add_b(const u8 *build_id, size_t build_id_size,
        return build_id_cache__add_s(sbuild_id, name, is_kallsyms, is_vdso);
 }
 
+bool build_id_cache__cached(const char *sbuild_id)
+{
+       bool ret = false;
+       char *filename = build_id__filename(sbuild_id, NULL, 0);
+
+       if (filename && !access(filename, F_OK))
+               ret = true;
+       free(filename);
+
+       return ret;
+}
+
 int build_id_cache__remove_s(const char *sbuild_id)
 {
        const size_t size = PATH_MAX;

diff --git a/tools/perf/util/build-id.h b/tools/perf/util/build-id.h
index 31b3c6332a1ab3fb9c9ff81881c8b81753f758b4..2a094982f9545311350630396219915b373daea7 100644 (file)
--- a/tools/perf/util/build-id.h
+++ b/tools/perf/util/build-id.h
@@ -22,6 +22,7 @@ bool perf_session__read_build_ids(struct perf_session *session, bool with_hits);
 int perf_session__write_buildid_table(struct perf_session *session, int fd);
 int perf_session__cache_build_ids(struct perf_session *session);
 
+bool build_id_cache__cached(const char *sbuild_id);
 int build_id_cache__add_s(const char *sbuild_id,
                          const char *name, bool is_kallsyms, bool is_vdso);
 int build_id_cache__remove_s(const char *sbuild_id);