Commit 735f7e0b authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf evlist: Move the SIGUSR1 error reporting logic to prepare_workload 

So that we have the boilerplate in the preparation method, instead of
open coded in tools wanting the reporting when the exec fails.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-purbdzcphdveskh7wwmnm4t7@git.kernel.org


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

tools/perf/builtin-record.c

+2 −14
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) 
	if (forks) {

		err = perf_evlist__prepare_workload(evsel_list, &opts->target,

						    argv, file->is_pipe,

						    true);

						    workload_exec_failed_signal);

		if (err < 0) {

			pr_err("Couldn't run the workload!\n");

			goto out_delete_session;
@@ -507,20 +507,8 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) 
	/*

	 * Let the child rip

	 */

	if (forks) {

		struct sigaction act = {

			.sa_flags     = SA_SIGINFO,

			.sa_sigaction = workload_exec_failed_signal,

		};

		/*

		 * perf_evlist__prepare_workload will, after we call

		 * perf_evlist__start_Workload, send a SIGUSR1 if the exec call

		 * fails, that we will catch in workload_signal to flip

		 * workload_exec_errno.

 		 */

		sigaction(SIGUSR1, &act, NULL);

	if (forks)

		perf_evlist__start_workload(evsel_list);

	}



	for (;;) {

		int hits = rec->samples;

tools/perf/builtin-stat.c

+2 −15
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ 
#include "util/thread.h"

#include "util/thread_map.h"



#include <signal.h>

#include <stdlib.h>

#include <sys/prctl.h>

#include <locale.h>
@@ -542,8 +541,8 @@ static int __run_perf_stat(int argc, const char **argv) 
	}



	if (forks) {

		if (perf_evlist__prepare_workload(evsel_list, &target, argv,

						  false, true) < 0) {

		if (perf_evlist__prepare_workload(evsel_list, &target, argv, false,

						  workload_exec_failed_signal) < 0) {

			perror("failed to prepare workload");

			return -1;

		}
@@ -598,18 +597,6 @@ static int __run_perf_stat(int argc, const char **argv) 
	clock_gettime(CLOCK_MONOTONIC, &ref_time);



	if (forks) {

		struct sigaction act = {

			.sa_flags     = SA_SIGINFO,

			.sa_sigaction = workload_exec_failed_signal,

		};

		/*

		 * perf_evlist__prepare_workload will, after we call

		 * perf_evlist__start_Workload, send a SIGUSR1 if the exec call

		 * fails, that we will catch in workload_signal to flip

		 * workload_exec_errno.

 		 */

		sigaction(SIGUSR1, &act, NULL);



		perf_evlist__start_workload(evsel_list);

		handle_initial_delay();

tools/perf/builtin-trace.c

+1 −1
Original line number Diff line number Diff line
@@ -1895,7 +1895,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) 


	if (forks) {

		err = perf_evlist__prepare_workload(evlist, &trace->opts.target,

						    argv, false, false);

						    argv, false, NULL);

		if (err < 0) {

			fprintf(trace->output, "Couldn't run the workload!\n");

			goto out_delete_maps;

tools/perf/tests/perf-record.c

+1 −2
Original line number Diff line number Diff line
@@ -83,8 +83,7 @@ int test__PERF_RECORD(void) 
	 * so that we have time to open the evlist (calling sys_perf_event_open

	 * on all the fds) and then mmap them.

	 */

	err = perf_evlist__prepare_workload(evlist, &opts.target, argv,

					    false, false);

	err = perf_evlist__prepare_workload(evlist, &opts.target, argv, false, NULL);

	if (err < 0) {

		pr_debug("Couldn't run the workload!\n");

		goto out_delete_maps;

tools/perf/tests/task-exit.c

+14 −5
Original line number Diff line number Diff line
@@ -9,11 +9,20 @@ 
static int exited;

static int nr_exit;



static void sig_handler(int sig)

static void sig_handler(int sig __maybe_unused)

{

	exited = 1;

}



	if (sig == SIGUSR1)

/*

 * perf_evlist__prepare_workload will send a SIGUSR1 if the fork fails, since

 * we asked by setting its exec_error to this handler.

 */

static void workload_exec_failed_signal(int signo __maybe_unused,

					siginfo_t *info __maybe_unused,

					void *ucontext __maybe_unused)

{

	exited	= 1;

	nr_exit = -1;

}
@@ -35,7 +44,6 @@ int test__task_exit(void) 
	const char *argv[] = { "true", NULL };



	signal(SIGCHLD, sig_handler);

	signal(SIGUSR1, sig_handler);



	evlist = perf_evlist__new_default();

	if (evlist == NULL) {
@@ -57,7 +65,8 @@ int test__task_exit(void) 
		goto out_delete_maps;

	}



	err = perf_evlist__prepare_workload(evlist, &target, argv, false, true);

	err = perf_evlist__prepare_workload(evlist, &target, argv, false,

					    workload_exec_failed_signal);

	if (err < 0) {

		pr_debug("Couldn't run the workload!\n");

		goto out_delete_maps;

CRA Git | Maintained and supported by SUSTech CRA and CCSE