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

Commit ba3dfff8 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Arnaldo Carvalho de Melo
Browse files

perf test: Use strerror_r instead of strerror 



Use strerror_r instead of strerror in error messages for thread-safety.

Signed-off-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20140814022245.3545.91394.stgit@kbuild-fedora.novalocal


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

tools/perf/tests/builtin-test.c

+3 −1
Original line number Diff line number Diff line
@@ -185,9 +185,11 @@ static bool perf_test__matches(int curr, int argc, const char *argv[]) 
static int run_test(struct test *test)

{

	int status, err = -1, child = fork();

	char sbuf[STRERR_BUFSIZE];



	if (child < 0) {

		pr_err("failed to fork test: %s\n", strerror(errno));

		pr_err("failed to fork test: %s\n",

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

		return -1;

	}

tools/perf/tests/mmap-basic.c

+4 −3
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ int test__basic_mmap(void) 
	unsigned int nr_events[nsyscalls],

		     expected_nr_events[nsyscalls], i, j;

	struct perf_evsel *evsels[nsyscalls], *evsel;

	char sbuf[STRERR_BUFSIZE];



	threads = thread_map__new(-1, getpid(), UINT_MAX);

	if (threads == NULL) {
@@ -49,7 +50,7 @@ int test__basic_mmap(void) 
	sched_setaffinity(0, sizeof(cpu_set), &cpu_set);

	if (sched_setaffinity(0, sizeof(cpu_set), &cpu_set) < 0) {

		pr_debug("sched_setaffinity() failed on CPU %d: %s ",

			 cpus->map[0], strerror(errno));

			 cpus->map[0], strerror_r(errno, sbuf, sizeof(sbuf)));

		goto out_free_cpus;

	}
@@ -79,7 +80,7 @@ int test__basic_mmap(void) 
		if (perf_evsel__open(evsels[i], cpus, threads) < 0) {

			pr_debug("failed to open counter: %s, "

				 "tweak /proc/sys/kernel/perf_event_paranoid?\n",

				 strerror(errno));

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

			goto out_delete_evlist;

		}
@@ -89,7 +90,7 @@ int test__basic_mmap(void) 


	if (perf_evlist__mmap(evlist, 128, true) < 0) {

		pr_debug("failed to mmap events: %d (%s)\n", errno,

			 strerror(errno));

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

		goto out_delete_evlist;

	}

tools/perf/tests/open-syscall-all-cpus.c

+3 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ int test__open_syscall_event_on_all_cpus(void) 
	unsigned int nr_open_calls = 111, i;

	cpu_set_t cpu_set;

	struct thread_map *threads = thread_map__new(-1, getpid(), UINT_MAX);

	char sbuf[STRERR_BUFSIZE];



	if (threads == NULL) {

		pr_debug("thread_map__new\n");
@@ -35,7 +36,7 @@ int test__open_syscall_event_on_all_cpus(void) 
	if (perf_evsel__open(evsel, cpus, threads) < 0) {

		pr_debug("failed to open counter: %s, "

			 "tweak /proc/sys/kernel/perf_event_paranoid?\n",

			 strerror(errno));

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

		goto out_evsel_delete;

	}
@@ -56,7 +57,7 @@ int test__open_syscall_event_on_all_cpus(void) 
		if (sched_setaffinity(0, sizeof(cpu_set), &cpu_set) < 0) {

			pr_debug("sched_setaffinity() failed on CPU %d: %s ",

				 cpus->map[cpu],

				 strerror(errno));

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

			goto out_close_fd;

		}

		for (i = 0; i < ncalls; ++i) {

tools/perf/tests/open-syscall-tp-fields.c

+5 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ int test__syscall_open_tp_fields(void) 
	struct perf_evlist *evlist = perf_evlist__new();

	struct perf_evsel *evsel;

	int err = -1, i, nr_events = 0, nr_polls = 0;

	char sbuf[STRERR_BUFSIZE];



	if (evlist == NULL) {

		pr_debug("%s: perf_evlist__new\n", __func__);
@@ -48,13 +49,15 @@ int test__syscall_open_tp_fields(void) 


	err = perf_evlist__open(evlist);

	if (err < 0) {

		pr_debug("perf_evlist__open: %s\n", strerror(errno));

		pr_debug("perf_evlist__open: %s\n",

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

		goto out_delete_evlist;

	}



	err = perf_evlist__mmap(evlist, UINT_MAX, false);

	if (err < 0) {

		pr_debug("perf_evlist__mmap: %s\n", strerror(errno));

		pr_debug("perf_evlist__mmap: %s\n",

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

		goto out_delete_evlist;

	}

tools/perf/tests/open-syscall.c

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ int test__open_syscall_event(void) 
	struct perf_evsel *evsel;

	unsigned int nr_open_calls = 111, i;

	struct thread_map *threads = thread_map__new(-1, getpid(), UINT_MAX);

	char sbuf[STRERR_BUFSIZE];



	if (threads == NULL) {

		pr_debug("thread_map__new\n");
@@ -24,7 +25,7 @@ int test__open_syscall_event(void) 
	if (perf_evsel__open_per_thread(evsel, threads) < 0) {

		pr_debug("failed to open counter: %s, "

			 "tweak /proc/sys/kernel/perf_event_paranoid?\n",

			 strerror(errno));

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

		goto out_evsel_delete;

	}