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

Commit 9b261365 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo' of... 

Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf

 into perf/core

Pull perf/core improvements and fixes from Jiri Olsa:

  * Add support to accumulate hist periods (Namhyung Kim)

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents e450f90e 0506aecc

tools/perf/Documentation/perf-report.txt

+6 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ OPTIONS 
--fields=::

	Specify output field - multiple keys can be specified in CSV format.

	Following fields are available:

	overhead, overhead_sys, overhead_us, sample and period.

	overhead, overhead_sys, overhead_us, overhead_children, sample and period.

	Also it can contain any sort key(s).



	By default, every sort keys not specified in -F will be appended
@@ -163,6 +163,11 @@ OPTIONS 


	Default: fractal,0.5,callee,function.



--children::

	Accumulate callchain of children to parent entry so that then can

	show up in the output.  The output will have a new "Children" column

	and will be sorted on the data.  It requires callchains are recorded.



--max-stack::

	Set the stack depth limit when parsing the callchain, anything

	beyond the specified depth will be ignored. This is a trade-off

tools/perf/Documentation/perf-top.txt

+7 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ Default is to monitor all CPUS. 
--fields=::

	Specify output field - multiple keys can be specified in CSV format.

	Following fields are available:

	overhead, overhead_sys, overhead_us, sample and period.

	overhead, overhead_sys, overhead_us, overhead_children, sample and period.

	Also it can contain any sort key(s).



	By default, every sort keys not specified in --field will be appended
@@ -161,6 +161,12 @@ Default is to monitor all CPUS. 
	Setup and enable call-graph (stack chain/backtrace) recording,

	implies -g.



--children::

	Accumulate callchain of children to parent entry so that then can

	show up in the output.  The output will have a new "Children" column

	and will be sorted on the data.  It requires -g/--call-graph option

	enabled.



--max-stack::

	Set the stack depth limit when parsing the callchain, anything

	beyond the specified depth will be ignored. This is a trade-off

tools/perf/Makefile.perf

+1 −0
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ LIB_OBJS += $(OUTPUT)tests/hists_common.o 
LIB_OBJS += $(OUTPUT)tests/hists_link.o

LIB_OBJS += $(OUTPUT)tests/hists_filter.o

LIB_OBJS += $(OUTPUT)tests/hists_output.o

LIB_OBJS += $(OUTPUT)tests/hists_cumulate.o

LIB_OBJS += $(OUTPUT)tests/python-use.o

LIB_OBJS += $(OUTPUT)tests/bp_signal.o

LIB_OBJS += $(OUTPUT)tests/bp_signal_overflow.o

tools/perf/builtin-annotate.c

+3 −2
Original line number Diff line number Diff line
@@ -65,12 +65,13 @@ static int perf_evsel__add_sample(struct perf_evsel *evsel, 
		return 0;

	}



	he = __hists__add_entry(&evsel->hists, al, NULL, NULL, NULL, 1, 1, 0);

	he = __hists__add_entry(&evsel->hists, al, NULL, NULL, NULL, 1, 1, 0,

				true);

	if (he == NULL)

		return -ENOMEM;



	ret = hist_entry__inc_addr_samples(he, evsel->idx, al->addr);

	hists__inc_nr_events(&evsel->hists, PERF_RECORD_SAMPLE);

	hists__inc_nr_samples(&evsel->hists, true);

	return ret;

}

tools/perf/builtin-diff.c

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ static int hists__add_entry(struct hists *hists, 
			    u64 weight, u64 transaction)

{

	if (__hists__add_entry(hists, al, NULL, NULL, NULL, period, weight,

			       transaction) != NULL)

			       transaction, true) != NULL)

		return 0;

	return -ENOMEM;

}