Commit da406202 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Add debug messages and comments for testing 



Add debug messages to enable scripts to track aspects of 'perf record'
behaviour. The messages will be consumed after 'perf record' has run,
with the exception of "perf record has started" which is consequently
flushed.

Put comments so developers know which messages are also being used by test
scripts.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Link: https://lore.kernel.org/r/20220912083412.7058-11-adrian.hunter@intel.com


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

tools/lib/perf/evlist.c

+2 −0
Original line number Diff line number Diff line
@@ -487,6 +487,7 @@ mmap_per_evsel(struct perf_evlist *evlist, struct perf_evlist_mmap_ops *ops, 
			if (ops->idx)

				ops->idx(evlist, evsel, mp, idx);



			/* Debug message used by test scripts */

			pr_debug("idx %d: mmapping fd %d\n", idx, *output);

			if (ops->mmap(map, mp, *output, evlist_cpu) < 0)

				return -1;
@@ -496,6 +497,7 @@ mmap_per_evsel(struct perf_evlist *evlist, struct perf_evlist_mmap_ops *ops, 
			if (!idx)

				perf_evlist__set_mmap_first(evlist, map, overwrite);

		} else {

			/* Debug message used by test scripts */

			pr_debug("idx %d: set output fd %d -> %d\n", idx, fd, *output);

			if (ioctl(fd, PERF_EVENT_IOC_SET_OUTPUT, *output) != 0)

				return -1;

tools/perf/builtin-record.c

+8 −0
Original line number Diff line number Diff line
@@ -2434,10 +2434,14 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) 


	record__uniquify_name(rec);



	/* Debug message used by test scripts */

	pr_debug3("perf record opening and mmapping events\n");

	if (record__open(rec) != 0) {

		err = -1;

		goto out_free_threads;

	}

	/* Debug message used by test scripts */

	pr_debug3("perf record done opening and mmapping events\n");

	session->header.env.comp_mmap_len = session->evlist->core.mmap_len;



	if (rec->opts.kcore) {
@@ -2580,6 +2584,10 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) 
	if (err)

		goto out_child;



	/* Debug message used by test scripts */

	pr_debug3("perf record has started\n");

	fflush(stderr);



	trigger_ready(&auxtrace_snapshot_trigger);

	trigger_ready(&switch_output_trigger);

	perf_hooks__invoke_record_start();

tools/perf/util/evsel.c

+2 −0
Original line number Diff line number Diff line
@@ -2089,6 +2089,7 @@ static int evsel__open_cpu(struct evsel *evsel, struct perf_cpu_map *cpus, 


			test_attr__ready();



			/* Debug message used by test scripts */

			pr_debug2_peo("sys_perf_event_open: pid %d  cpu %d  group_fd %d  flags %#lx",

				pid, perf_cpu_map__cpu(cpus, idx).cpu, group_fd, evsel->open_flags);
@@ -2114,6 +2115,7 @@ static int evsel__open_cpu(struct evsel *evsel, struct perf_cpu_map *cpus, 
						fd, group_fd, evsel->open_flags);

			}



			/* Debug message used by test scripts */

			pr_debug2_peo(" = %d\n", fd);



			if (evsel->bpf_fd >= 0) {