Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 498922ad authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf buildid-cache: Remove extra debugdir variables 



There's no need to copy over the buildid_dir into separate variable with
no change.

This is leftover from commit:
  45de34bb perf buildid: add perfconfig option to specify buildid cache dir

that added global buildid_dir variable that holds cache directory, but
did not cleanup the debugdir copies.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1417460789-13874-3-git-send-email-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent cfd31d85

tools/perf/builtin-buildid-cache.c

+4 −7
Original line number Diff line number Diff line
@@ -285,7 +285,6 @@ 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,
@@ -335,13 +334,11 @@ int cmd_buildid_cache(int argc, const char **argv, 


	setup_pager();



	snprintf(debugdir, sizeof(debugdir), "%s", buildid_dir);



	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);
@@ -359,7 +356,7 @@ 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);
@@ -380,7 +377,7 @@ int cmd_buildid_cache(int argc, const char **argv, 
		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);
@@ -395,7 +392,7 @@ 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:

tools/perf/util/build-id.c

+3 −6
Original line number Diff line number Diff line
@@ -410,21 +410,18 @@ int perf_session__cache_build_ids(struct perf_session *session) 
{

	struct rb_node *nd;

	int ret;

	char debugdir[PATH_MAX];



	if (no_buildid_cache)

		return 0;



	snprintf(debugdir, sizeof(debugdir), "%s", buildid_dir);



	if (mkdir(debugdir, 0755) != 0 && errno != EEXIST)

	if (mkdir(buildid_dir, 0755) != 0 && errno != EEXIST)

		return -1;



	ret = machine__cache_build_ids(&session->machines.host, debugdir);

	ret = machine__cache_build_ids(&session->machines.host, buildid_dir);



	for (nd = rb_first(&session->machines.guests); nd; nd = rb_next(nd)) {

		struct machine *pos = rb_entry(nd, struct machine, rb_node);

		ret |= machine__cache_build_ids(pos, debugdir);

		ret |= machine__cache_build_ids(pos, buildid_dir);

	}

	return ret ? -1 : 0;

}