Commit af924aa3 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo' of... 

Merge tag 'perf-core-for-mingo' 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:

  * Warn user to rebuild target with debuginfo in 'perf probe' (Masami Hiramatsu)

  * Don't truncate Intel style addresses in 'annotate'. (Alex Converse)

Infrastructure changes:

  * Annotate PMU related list_head members with type info. (Cody P Schafer)

  * Add the triplet used for arm64 by Android (Elliott Hughes)

  * Replace thread unsafe strerror() with strerror_r() accross the
    whole tools/perf/ tree (Masami Hiramatsu)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents f373da34 759e612b

tools/perf/arch/common.c

+9 −0
Original line number Diff line number Diff line
@@ -12,6 +12,11 @@ const char *const arm_triplets[] = { 
	NULL

};



const char *const arm64_triplets[] = {

	"aarch64-linux-android-",

	NULL

};



const char *const powerpc_triplets[] = {

	"powerpc-unknown-linux-gnu-",

	"powerpc64-unknown-linux-gnu-",
@@ -105,6 +110,8 @@ static const char *normalize_arch(char *arch) 
		return "x86";

	if (!strcmp(arch, "sun4u") || !strncmp(arch, "sparc", 5))

		return "sparc";

	if (!strcmp(arch, "aarch64") || !strcmp(arch, "arm64"))

		return "arm64";

	if (!strncmp(arch, "arm", 3) || !strcmp(arch, "sa110"))

		return "arm";

	if (!strncmp(arch, "s390", 4))
@@ -159,6 +166,8 @@ static int perf_session_env__lookup_binutils_path(struct perf_session_env *env, 


	if (!strcmp(arch, "arm"))

		path_list = arm_triplets;

	else if (!strcmp(arch, "arm64"))

		path_list = arm64_triplets;

	else if (!strcmp(arch, "powerpc"))

		path_list = powerpc_triplets;

	else if (!strcmp(arch, "sh"))

tools/perf/builtin-buildid-cache.c

+4 −3
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ int cmd_buildid_cache(int argc, const char **argv, 
		   *missing_filename = NULL,

		   *update_name_list_str = NULL,

		   *kcore_filename;

	char sbuf[STRERR_BUFSIZE];



	struct perf_data_file file = {

		.mode  = PERF_DATA_MODE_READ,
@@ -347,7 +348,7 @@ int cmd_buildid_cache(int argc, const char **argv, 
						continue;

					}

					pr_warning("Couldn't add %s: %s\n",

						   pos->s, strerror(errno));

						   pos->s, strerror_r(errno, sbuf, sizeof(sbuf)));

				}



			strlist__delete(list);
@@ -365,7 +366,7 @@ int cmd_buildid_cache(int argc, const char **argv, 
						continue;

					}

					pr_warning("Couldn't remove %s: %s\n",

						   pos->s, strerror(errno));

						   pos->s, strerror_r(errno, sbuf, sizeof(sbuf)));

				}



			strlist__delete(list);
@@ -386,7 +387,7 @@ int cmd_buildid_cache(int argc, const char **argv, 
						continue;

					}

					pr_warning("Couldn't update %s: %s\n",

						   pos->s, strerror(errno));

						   pos->s, strerror_r(errno, sbuf, sizeof(sbuf)));

				}



			strlist__delete(list);

tools/perf/builtin-help.c

+16 −4
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ static int check_emacsclient_version(void) 


static void exec_woman_emacs(const char *path, const char *page)

{

	char sbuf[STRERR_BUFSIZE];



	if (!check_emacsclient_version()) {

		/* This works only with emacsclient version >= 22. */

		struct strbuf man_page = STRBUF_INIT;
@@ -111,16 +113,19 @@ static void exec_woman_emacs(const char *path, const char *page) 
			path = "emacsclient";

		strbuf_addf(&man_page, "(woman \"%s\")", page);

		execlp(path, "emacsclient", "-e", man_page.buf, NULL);

		warning("failed to exec '%s': %s", path, strerror(errno));

		warning("failed to exec '%s': %s", path,

			strerror_r(errno, sbuf, sizeof(sbuf)));

	}

}



static void exec_man_konqueror(const char *path, const char *page)

{

	const char *display = getenv("DISPLAY");



	if (display && *display) {

		struct strbuf man_page = STRBUF_INIT;

		const char *filename = "kfmclient";

		char sbuf[STRERR_BUFSIZE];



		/* It's simpler to launch konqueror using kfmclient. */

		if (path) {
@@ -139,24 +144,31 @@ static void exec_man_konqueror(const char *path, const char *page) 
			path = "kfmclient";

		strbuf_addf(&man_page, "man:%s(1)", page);

		execlp(path, filename, "newTab", man_page.buf, NULL);

		warning("failed to exec '%s': %s", path, strerror(errno));

		warning("failed to exec '%s': %s", path,

			strerror_r(errno, sbuf, sizeof(sbuf)));

	}

}



static void exec_man_man(const char *path, const char *page)

{

	char sbuf[STRERR_BUFSIZE];



	if (!path)

		path = "man";

	execlp(path, "man", page, NULL);

	warning("failed to exec '%s': %s", path, strerror(errno));

	warning("failed to exec '%s': %s", path,

		strerror_r(errno, sbuf, sizeof(sbuf)));

}



static void exec_man_cmd(const char *cmd, const char *page)

{

	struct strbuf shell_cmd = STRBUF_INIT;

	char sbuf[STRERR_BUFSIZE];



	strbuf_addf(&shell_cmd, "%s %s", cmd, page);

	execl("/bin/sh", "sh", "-c", shell_cmd.buf, NULL);

	warning("failed to exec '%s': %s", cmd, strerror(errno));

	warning("failed to exec '%s': %s", cmd,

		strerror_r(errno, sbuf, sizeof(sbuf)));

}



static void add_man_viewer(const char *name)

tools/perf/builtin-kvm.c

+5 −2
Original line number Diff line number Diff line
@@ -990,6 +990,7 @@ static int kvm_live_open_events(struct perf_kvm_stat *kvm) 
	int err, rc = -1;

	struct perf_evsel *pos;

	struct perf_evlist *evlist = kvm->evlist;

	char sbuf[STRERR_BUFSIZE];



	perf_evlist__config(evlist, &kvm->opts);
@@ -1026,12 +1027,14 @@ static int kvm_live_open_events(struct perf_kvm_stat *kvm) 


	err = perf_evlist__open(evlist);

	if (err < 0) {

		printf("Couldn't create the events: %s\n", strerror(errno));

		printf("Couldn't create the events: %s\n",

		       strerror_r(errno, sbuf, sizeof(sbuf)));

		goto out;

	}



	if (perf_evlist__mmap(evlist, kvm->opts.mmap_pages, false) < 0) {

		ui__error("Failed to mmap the events: %s\n", strerror(errno));

		ui__error("Failed to mmap the events: %s\n",

			  strerror_r(errno, sbuf, sizeof(sbuf)));

		perf_evlist__close(evlist);

		goto out;

	}

tools/perf/builtin-probe.c

+4 −1
Original line number Diff line number Diff line
@@ -290,8 +290,11 @@ static void cleanup_params(void) 


static void pr_err_with_code(const char *msg, int err)

{

	char sbuf[STRERR_BUFSIZE];



	pr_err("%s", msg);

	pr_debug(" Reason: %s (Code: %d)", strerror(-err), err);

	pr_debug(" Reason: %s (Code: %d)",

		 strerror_r(-err, sbuf, sizeof(sbuf)), err);

	pr_err("\n");

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE