Commit 34c86ea9 authored by Tom Zanussi's avatar Tom Zanussi
Browse files

perf trace record: handle commands correctly 



Because the perf-trace shell scripts hard-coded the use of the
perf-record system-wide param, a perf trace record session was always
system wide, even if it was given a command.

If given a command, perf trace record now only records the events for
the command, as users expect.

If no command is given, or if the '-a' option is used, the recorded
events are system-wide, as before.

root@tropicana:~# perf trace record syscall-counts ls -al
root@tropicana:~# perf trace
              ls-23152 [000] 39984.890387: sys_enter: NR 12 (0, 0, 0, 0, 0, 0)
              ls-23152 [000] 39984.890404: sys_enter: NR 9 (0, 0, 0, 0, 0, 0)

root@tropicana:~# perf trace record syscall-counts -a ls -al
root@tropicana:~# perf trace
    npviewer.bin-22297 [000] 39831.102709: sys_enter: NR 168 (0, 0, 0, 0, 0, 0)
              ls-23111 [000] 39831.107679: sys_enter: NR 59 (0, 0, 0, 0, 0, 0)

Signed-off-by: default avatarTom Zanussi <tom.zanussi@linux.intel.com>
Acked-by: default avatarArnaldo Carvalho de Melo <acme@ghostprotocols.net>
parent bca647aa

tools/perf/builtin-trace.c

+28 −4
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include "util/symbol.h"

#include "util/symbol.h"

#include "util/thread.h"

#include "util/thread.h"

#include "util/trace-event.h"

#include "util/trace-event.h"

#include "util/parse-options.h"

#include "util/util.h"

#include "util/util.h"





static char const		*script_name;

static char const		*script_name;
@@ -17,6 +18,7 @@ static char const *generate_script_lang; 
static bool			debug_mode;

static bool			debug_mode;

static u64			last_timestamp;

static u64			last_timestamp;

static u64			nr_unordered;

static u64			nr_unordered;

extern const struct option	record_options[];





static int default_start_script(const char *script __unused,

static int default_start_script(const char *script __unused,

				int argc __unused,

				int argc __unused,
@@ -566,6 +568,20 @@ static const struct option options[] = { 
	OPT_END()

	OPT_END()

};

};





static bool have_cmd(int argc, const char **argv)

{

	char **__argv = malloc(sizeof(const char *) * argc);



	if (!__argv)

		die("malloc");

	memcpy(__argv, argv, sizeof(const char *) * argc);

	argc = parse_options(argc, (const char **)__argv, record_options,

			     NULL, PARSE_OPT_STOP_AT_NON_OPTION);

	free(__argv);



	return argc != 0;

}



int cmd_trace(int argc, const char **argv, const char *prefix __used)

int cmd_trace(int argc, const char **argv, const char *prefix __used)

{

{

	struct perf_session *session;

	struct perf_session *session;
@@ -663,20 +679,28 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used) 
	}

	}





	if (suffix) {

	if (suffix) {

		bool system_wide = false;

		int j = 0;



		script_path = get_script_path(argv[2], suffix);

		script_path = get_script_path(argv[2], suffix);

		if (!script_path) {

		if (!script_path) {

			fprintf(stderr, "script not found\n");

			fprintf(stderr, "script not found\n");

			return -1;

			return -1;

		}

		}





		if (!strcmp(suffix, RECORD_SUFFIX))

			system_wide = !have_cmd(argc - 2, &argv[2]);



		__argv = malloc((argc + 1) * sizeof(const char *));

		__argv = malloc((argc + 1) * sizeof(const char *));

		if (!__argv)

		if (!__argv)

			die("malloc");

			die("malloc");

		__argv[0] = "/bin/sh";

		__argv[j++] = "/bin/sh";

		__argv[1] = script_path;

		__argv[j++] = script_path;

		if (system_wide)

			__argv[j++] = "-a";

		for (i = 3; i < argc; i++)

		for (i = 3; i < argc; i++)

			__argv[i - 1] = argv[i];

			__argv[j++] = argv[i];

		__argv[argc - 1] = NULL;

		__argv[j++] = NULL;





		execvp("/bin/sh", (char **)__argv);

		execvp("/bin/sh", (char **)__argv);

		free(__argv);

		free(__argv);

CRA Git | Maintained and supported by SUSTech CRA and CCSE