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

perf intel-pt: Support itrace d+o option to direct debug log to stdout 



It can be useful to see debug output in between normal output.

Add support for AUXTRACE_LOG_FLG_USE_STDOUT to Intel PT.

Reviewed-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: https://lore.kernel.org/r/20211027080334.365596-7-adrian.hunter@intel.com


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

tools/perf/Documentation/perf-intel-pt.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -953,6 +953,7 @@ by flags which affect what debug messages will or will not be logged. Each flag 
must be preceded by either '+' or '-'. The flags support by Intel PT are:

must be preceded by either '+' or '-'. The flags support by Intel PT are:

		-a	Suppress logging of perf events

		-a	Suppress logging of perf events

		+a	Log all perf events

		+a	Log all perf events

		+o	Output to stdout instead of "intel_pt.log"

By default, logged perf events are filtered by any specified time ranges, but

By default, logged perf events are filtered by any specified time ranges, but

flag +a overrides that.

flag +a overrides that.

tools/perf/util/intel-pt-decoder/intel-pt-log.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -82,10 +82,10 @@ static int intel_pt_log_open(void) 
	if (f)

	if (f)

		return 0;

		return 0;





	if (!log_name[0])

	if (log_name[0])

		return -1;



		f = fopen(log_name, "w+");

		f = fopen(log_name, "w+");

	else

		f = stdout;

	if (!f) {

	if (!f) {

		intel_pt_enable_logging = false;

		intel_pt_enable_logging = false;

		return -1;

		return -1;

tools/perf/util/intel-pt.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -3736,8 +3736,6 @@ int intel_pt_process_auxtrace_info(union perf_event *event, 
	if (err)

	if (err)

		goto err_free;

		goto err_free;





	intel_pt_log_set_name(INTEL_PT_PMU_NAME);



	if (session->itrace_synth_opts->set) {

	if (session->itrace_synth_opts->set) {

		pt->synth_opts = *session->itrace_synth_opts;

		pt->synth_opts = *session->itrace_synth_opts;

	} else {

	} else {
@@ -3752,6 +3750,9 @@ int intel_pt_process_auxtrace_info(union perf_event *event, 
		pt->synth_opts.thread_stack = opts->thread_stack;

		pt->synth_opts.thread_stack = opts->thread_stack;

	}

	}





	if (!(pt->synth_opts.log_plus_flags & AUXTRACE_LOG_FLG_USE_STDOUT))

		intel_pt_log_set_name(INTEL_PT_PMU_NAME);



	pt->session = session;

	pt->session = session;

	pt->machine = &session->machines.host; /* No kvm support */

	pt->machine = &session->machines.host; /* No kvm support */

	pt->auxtrace_type = auxtrace_info->type;

	pt->auxtrace_type = auxtrace_info->type;