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

Commit 591421e1 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf trace: Add --print-sample 

To help with debugging, like the interrupted out of order issue that
will be dealt with in the next patch in this series, changing the code
to deal with:

raw_syscalls:sys_enter 411967179.269 Timer 9609/9626 [2]
raw_syscalls:sys_enter 411967179.213 file:// Content 9609/9609 [3]
   328.038 (18446744073709.496 ms): Timer/9626 futex(uaddr: 0x7fc0d4027044, op: WAIT|PRIV, utime: 0x7fc0b0ffdb50     ) ...
 raw_syscalls:sys_exit 411967179.225 file:// Content 9609/9609 [3]
   327.982 ( 0.012 ms): file:// Conten/9609 futex(uaddr: 0x7fc0d4027040, op: WAKE|PRIV, val: 1                    ) = 1

That long duration is the bug.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-fljqiibjn7wet24jd1ed7abc@git.kernel.org


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

tools/perf/Documentation/perf-trace.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -163,6 +163,10 @@ the thread executes on the designated CPUs. Default is to monitor all CPUs. 
        Implies '--call-graph dwarf' when --call-graph not present on the

        Implies '--call-graph dwarf' when --call-graph not present on the

        command line, on systems where DWARF unwinding was built in.

        command line, on systems where DWARF unwinding was built in.





--print-sample::

	Print the PERF_RECORD_SAMPLE PERF_SAMPLE_ info for the

	raw_syscalls:sys_{enter,exit} tracepoints, for debugging.



--proc-map-timeout::

--proc-map-timeout::

	When processing pre-existing threads /proc/XXX/mmap, it may take a long time,

	When processing pre-existing threads /proc/XXX/mmap, it may take a long time,

	because the file may be huge. A time out is needed in such cases.

	because the file may be huge. A time out is needed in such cases.

tools/perf/builtin-trace.c

+24 −0
Original line number Original line Diff line number Diff line
@@ -110,6 +110,7 @@ struct trace { 
	bool			summary;

	bool			summary;

	bool			summary_only;

	bool			summary_only;

	bool			show_comm;

	bool			show_comm;

	bool			print_sample;

	bool			show_tool_stats;

	bool			show_tool_stats;

	bool			trace_syscalls;

	bool			trace_syscalls;

	bool			kernel_syscallchains;

	bool			kernel_syscallchains;
@@ -1578,6 +1579,23 @@ static int trace__printf_interrupted_entry(struct trace *trace, struct perf_samp 
	return printed;

	return printed;

}

}





static int trace__fprintf_sample(struct trace *trace, struct perf_evsel *evsel,

				 struct perf_sample *sample, struct thread *thread)

{

	int printed = 0;



	if (trace->print_sample) {

		double ts = (double)sample->time / NSEC_PER_MSEC;



		printed += fprintf(trace->output, "%22s %10.3f %s %d/%d [%d]\n",

				   perf_evsel__name(evsel), ts,

				   thread__comm_str(thread),

				   sample->pid, sample->tid, sample->cpu);

	}



	return printed;

}



static int trace__sys_enter(struct trace *trace, struct perf_evsel *evsel,

static int trace__sys_enter(struct trace *trace, struct perf_evsel *evsel,

			    union perf_event *event __maybe_unused,

			    union perf_event *event __maybe_unused,

			    struct perf_sample *sample)

			    struct perf_sample *sample)
@@ -1598,6 +1616,8 @@ static int trace__sys_enter(struct trace *trace, struct perf_evsel *evsel, 
	if (ttrace == NULL)

	if (ttrace == NULL)

		goto out_put;

		goto out_put;





	trace__fprintf_sample(trace, evsel, sample, thread);



	args = perf_evsel__sc_tp_ptr(evsel, args, sample);

	args = perf_evsel__sc_tp_ptr(evsel, args, sample);





	if (ttrace->entry_str == NULL) {

	if (ttrace->entry_str == NULL) {
@@ -1688,6 +1708,8 @@ static int trace__sys_exit(struct trace *trace, struct perf_evsel *evsel, 
	if (ttrace == NULL)

	if (ttrace == NULL)

		goto out_put;

		goto out_put;





	trace__fprintf_sample(trace, evsel, sample, thread);



	if (trace->summary)

	if (trace->summary)

		thread__update_stats(ttrace, id, sample);

		thread__update_stats(ttrace, id, sample);
@@ -3034,6 +3056,8 @@ int cmd_trace(int argc, const char **argv) 
		     "Set the maximum stack depth when parsing the callchain, "

		     "Set the maximum stack depth when parsing the callchain, "

		     "anything beyond the specified depth will be ignored. "

		     "anything beyond the specified depth will be ignored. "

		     "Default: kernel.perf_event_max_stack or " __stringify(PERF_MAX_STACK_DEPTH)),

		     "Default: kernel.perf_event_max_stack or " __stringify(PERF_MAX_STACK_DEPTH)),

	OPT_BOOLEAN(0, "print-sample", &trace.print_sample,

			"print the PERF_RECORD_SAMPLE PERF_SAMPLE_ info, for debugging"),

	OPT_UINTEGER(0, "proc-map-timeout", &trace.opts.proc_map_timeout,

	OPT_UINTEGER(0, "proc-map-timeout", &trace.opts.proc_map_timeout,

			"per thread proc mmap processing timeout in ms"),

			"per thread proc mmap processing timeout in ms"),

	OPT_UINTEGER('D', "delay", &trace.opts.initial_delay,

	OPT_UINTEGER('D', "delay", &trace.opts.initial_delay,