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

Commit 61d67d56 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/acme/linux

 into perf/core

Pull perf/core improvements and fixes:

User visible changes:

  - Beautify the perf_event_open() syscall in 'perf trace'. (Arnaldo Carvalho de Melo)

  - Error out unsupported group leader immediately in 'perf stat'. (Kan Liang)

  - Amend some 'perf record' option summaries (period, etc). (Peter Zijlstra)

  - Avoid possible race condition in copyfile() in 'perf buildid-cache'. (Milos Vyletel)

Infrastructure changes:

  - Display 0x for hex values when printing the attribute. (Adrian Hunter)

  - Update MANIFEST per files removed from kernel. (David Ahern)

Build fixes:

  - Fix PRIu64 printf related failure on 32-bit arch. (He Kuang)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 028c63b5 c8ad7063

tools/perf/Documentation/perf-record.txt

+7 −3
Original line number Diff line number Diff line
@@ -152,12 +152,16 @@ OPTIONS 


-d::

--data::

	Sample addresses.

	Record the sample addresses.



-T::

--timestamp::

	Sample timestamps. Use it with 'perf report -D' to see the timestamps,

	for instance.

	Record the sample timestamps. Use it with 'perf report -D' to see the

	timestamps, for instance.



-P::

--period::

	Record the sample period.



-n::

--no-samples::

tools/perf/MANIFEST

+0 −4
Original line number Diff line number Diff line
@@ -50,24 +50,20 @@ include/asm-generic/bitops/const_hweight.h 
include/asm-generic/bitops/fls64.h

include/asm-generic/bitops/__fls.h

include/asm-generic/bitops/fls.h

include/linux/const.h

include/linux/perf_event.h

include/linux/rbtree.h

include/linux/list.h

include/linux/hash.h

include/linux/stringify.h

lib/find_next_bit.c

lib/hweight.c

lib/rbtree.c

include/linux/swab.h

arch/*/include/asm/unistd*.h

arch/*/include/asm/perf_regs.h

arch/*/include/uapi/asm/unistd*.h

arch/*/include/uapi/asm/perf_regs.h

arch/*/lib/memcpy*.S

arch/*/lib/memset*.S

include/linux/poison.h

include/linux/magic.h

include/linux/hw_breakpoint.h

include/linux/rbtree_augmented.h

include/uapi/linux/perf_event.h

tools/perf/builtin-record.c

+3 −4
Original line number Diff line number Diff line
@@ -1027,10 +1027,9 @@ struct option __record_options[] = { 
	OPT_BOOLEAN('q', "quiet", &quiet, "don't print any message"),

	OPT_BOOLEAN('s', "stat", &record.opts.inherit_stat,

		    "per thread counts"),

	OPT_BOOLEAN('d', "data", &record.opts.sample_address,

		    "Sample addresses"),

	OPT_BOOLEAN('T', "timestamp", &record.opts.sample_time, "Sample timestamps"),

	OPT_BOOLEAN('P', "period", &record.opts.period, "Sample period"),

	OPT_BOOLEAN('d', "data", &record.opts.sample_address, "Record the sample addresses"),

	OPT_BOOLEAN('T', "timestamp", &record.opts.sample_time, "Record the sample timestamps"),

	OPT_BOOLEAN('P', "period", &record.opts.period, "Record the sample period"),

	OPT_BOOLEAN('n', "no-samples", &record.opts.no_samples,

		    "don't sample"),

	OPT_BOOLEAN('N', "no-buildid-cache", &record.no_buildid_cache,

tools/perf/builtin-report.c

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ static int perf_evlist__tty_browse_hists(struct perf_evlist *evlist, 
{

	struct perf_evsel *pos;



	fprintf(stdout, "#\n# Total Lost Samples: %lu\n#\n", evlist->stats.total_lost_samples);

	fprintf(stdout, "#\n# Total Lost Samples: %" PRIu64 "\n#\n", evlist->stats.total_lost_samples);

	evlist__for_each(evlist, pos) {

		struct hists *hists = evsel__hists(pos);

		const char *evname = perf_evsel__name(pos);

tools/perf/builtin-stat.c

+4 −1
Original line number Diff line number Diff line
@@ -549,6 +549,9 @@ static int __run_perf_stat(int argc, const char **argv) 
					ui__warning("%s event is not supported by the kernel.\n",

						    perf_evsel__name(counter));

				counter->supported = false;



				if ((counter->leader != counter) ||

				    !(counter->leader->nr_members > 1))

					continue;

			}