perf buildid-cache: Remove extra debugdir variables

[linux-2.6-block.git] / tools / perf / builtin-buildid-cache.c

diff --git a/tools/perf/builtin-buildid-cache.c b/tools/perf/builtin-buildid-cache.c
index 2a2c78f8087663852292d1220e51a41694ce0f3c..29f24c071bc6db7a0a34759f29034b1c0a9bb8c8 100644 (file)
--- a/tools/perf/builtin-buildid-cache.c
+++ b/tools/perf/builtin-buildid-cache.c
@@ -246,20 +246,9 @@ static bool dso__missing_buildid_cache(struct dso *dso, int parm __maybe_unused)
        return true;
 }
 
-static int build_id_cache__fprintf_missing(const char *filename, bool force, FILE *fp)
+static int build_id_cache__fprintf_missing(struct perf_session *session, FILE *fp)
 {
-       struct perf_data_file file = {
-               .path  = filename,
-               .mode  = PERF_DATA_MODE_READ,
-               .force = force,
-       };
-       struct perf_session *session = perf_session__new(&file, false, NULL);
-       if (session == NULL)
-               return -1;
-
        perf_session__fprintf_dsos_buildid(session, fp, dso__missing_buildid_cache, 0);
-       perf_session__delete(session);
-
        return 0;
 }
 
@@ -296,12 +285,17 @@ int cmd_buildid_cache(int argc, const char **argv,
        struct str_node *pos;
        int ret = 0;
        bool force = false;
-       char debugdir[PATH_MAX];
        char const *add_name_list_str = NULL,
                   *remove_name_list_str = NULL,
                   *missing_filename = NULL,
                   *update_name_list_str = NULL,
                   *kcore_filename;
+       char sbuf[STRERR_BUFSIZE];
+
+       struct perf_data_file file = {
+               .mode  = PERF_DATA_MODE_READ,
+       };
+       struct perf_session *session = NULL;
 
        const struct option buildid_cache_options[] = {
        OPT_STRING('a', "add", &add_name_list_str,
@@ -326,25 +320,32 @@ int cmd_buildid_cache(int argc, const char **argv,
        argc = parse_options(argc, argv, buildid_cache_options,
                             buildid_cache_usage, 0);
 
-       if (symbol__init() < 0)
-               return -1;
+       if (missing_filename) {
+               file.path = missing_filename;
+               file.force = force;
 
-       setup_pager();
+               session = perf_session__new(&file, false, NULL);
+               if (session == NULL)
+                       return -1;
+       }
+
+       if (symbol__init(session ? &session->header.env : NULL) < 0)
+               goto out;
 
-       snprintf(debugdir, sizeof(debugdir), "%s", buildid_dir);
+       setup_pager();
 
        if (add_name_list_str) {
                list = strlist__new(true, add_name_list_str);
                if (list) {
                        strlist__for_each(pos, list)
-                               if (build_id_cache__add_file(pos->s, debugdir)) {
+                               if (build_id_cache__add_file(pos->s, buildid_dir)) {
                                        if (errno == EEXIST) {
                                                pr_debug("%s already in the cache\n",
                                                         pos->s);
                                                continue;
                                        }
                                        pr_warning("Couldn't add %s: %s\n",
-                                                  pos->s, strerror(errno));
+                                                  pos->s, strerror_r(errno, sbuf, sizeof(sbuf)));
                                }
 
                        strlist__delete(list);
@@ -355,14 +356,14 @@ int cmd_buildid_cache(int argc, const char **argv,
                list = strlist__new(true, remove_name_list_str);
                if (list) {
                        strlist__for_each(pos, list)
-                               if (build_id_cache__remove_file(pos->s, debugdir)) {
+                               if (build_id_cache__remove_file(pos->s, buildid_dir)) {
                                        if (errno == ENOENT) {
                                                pr_debug("%s wasn't in the cache\n",
                                                         pos->s);
                                                continue;
                                        }
                                        pr_warning("Couldn't remove %s: %s\n",
-                                                  pos->s, strerror(errno));
+                                                  pos->s, strerror_r(errno, sbuf, sizeof(sbuf)));
                                }
 
                        strlist__delete(list);
@@ -370,20 +371,20 @@ int cmd_buildid_cache(int argc, const char **argv,
        }
 
        if (missing_filename)
-               ret = build_id_cache__fprintf_missing(missing_filename, force, stdout);
+               ret = build_id_cache__fprintf_missing(session, stdout);
 
        if (update_name_list_str) {
                list = strlist__new(true, update_name_list_str);
                if (list) {
                        strlist__for_each(pos, list)
-                               if (build_id_cache__update_file(pos->s, debugdir)) {
+                               if (build_id_cache__update_file(pos->s, buildid_dir)) {
                                        if (errno == ENOENT) {
                                                pr_debug("%s wasn't in the cache\n",
                                                         pos->s);
                                                continue;
                                        }
                                        pr_warning("Couldn't update %s: %s\n",
-                                                  pos->s, strerror(errno));
+                                                  pos->s, strerror_r(errno, sbuf, sizeof(sbuf)));
                                }
 
                        strlist__delete(list);
@@ -391,8 +392,12 @@ int cmd_buildid_cache(int argc, const char **argv,
        }
 
        if (kcore_filename &&
-           build_id_cache__add_kcore(kcore_filename, debugdir, force))
+           build_id_cache__add_kcore(kcore_filename, buildid_dir, force))
                pr_warning("Couldn't add %s\n", kcore_filename);
 
+out:
+       if (session)
+               perf_session__delete(session);
+
        return ret;
 }