Commit 00e4cb1c 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 from Arnaldo Carvalho de Melo:

 * Don't install scripting files files when perl/python support is disabled.

 * Support ! in -e expressions in 'perf trace', to filter a list of syscalls.

 * Add --verbose and -o/--output options to 'perf trace'.

 * Introduce better formatting of syscall arguments in 'perf trace',
   including so far beautifiers for mmap, madvise, syscall return
   values.

 * Fixup jobserver setup in libtraceevent makefile.

 * Debug improvements from Adrian Hunter.

 * Try to increase the file descriptor limits on EMFILE, from Andi Kleen.

 * Remove unused force option in 'perf kvm', from David Ahern.

 * Make 'perf trace' command line arguments consistent with 'perf record',
   from David Ahern.

 * Fix correlation of samples coming after PERF_RECORD_EXIT event, from
   David Ahern.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents aee2bce3 456da532

tools/lib/traceevent/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ ifeq ($(BUILD_SRC),) 
ifneq ($(BUILD_OUTPUT),)



define build_output

	$(if $(VERBOSE:1=),@)$(MAKE) -C $(BUILD_OUTPUT) 	\

	$(if $(VERBOSE:1=),@)+$(MAKE) -C $(BUILD_OUTPUT) 	\

	BUILD_SRC=$(CURDIR) -f $(CURDIR)/Makefile $1

endef

tools/perf/Documentation/perf-trace.txt

+16 −0
Original line number Diff line number Diff line
@@ -23,29 +23,45 @@ analysis phases. 
OPTIONS

-------



-a::

--all-cpus::

        System-wide collection from all CPUs.



-e::

--expr::

	List of events to show, currently only syscall names.

	Prefixing with ! shows all syscalls but the ones specified.  You may

	need to escape it.



-o::

--output=::

	Output file name.



-p::

--pid=::

	Record events on existing process ID (comma separated list).



-t::

--tid=::

        Record events on existing thread ID (comma separated list).



-u::

--uid=::

        Record events in threads owned by uid. Name or number.



-v::

--verbose=::

        Verbosity level.



-i::

--no-inherit::

	Child tasks do not inherit counters.



-m::

--mmap-pages=::

	Number of mmap data pages. Must be a power of two.



-C::

--cpu::

Collect samples only on the list of CPUs provided. Multiple CPUs can be provided as a

comma-separated list with no space: 0,1. Ranges of CPUs are specified with -: 0-2.

tools/perf/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -766,17 +766,21 @@ check: $(OUTPUT)common-cmds.h 
install-bin: all

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'

	$(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)'

	$(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'

ifndef NO_LIBPERL

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin'

	$(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'

	$(INSTALL) scripts/perl/Perf-Trace-Util/lib/Perf/Trace/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'

	$(INSTALL) scripts/perl/*.pl -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl'

	$(INSTALL) scripts/perl/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin'

endif

ifndef NO_LIBPYTHON

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/Perf-Trace-Util/lib/Perf/Trace'

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin'

	$(INSTALL) scripts/python/Perf-Trace-Util/lib/Perf/Trace/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/Perf-Trace-Util/lib/Perf/Trace'

	$(INSTALL) scripts/python/*.py -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python'

	$(INSTALL) scripts/python/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin'

endif

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d'

	$(INSTALL) bash_completion '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf'

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'

tools/perf/builtin-kvm.c

+0 −1
Original line number Diff line number Diff line
@@ -1305,7 +1305,6 @@ kvm_events_record(struct perf_kvm_stat *kvm, int argc, const char **argv) 
	const char * const record_args[] = {

		"record",

		"-R",

		"-f",

		"-m", "1024",

		"-c", "1",

	};

tools/perf/builtin-trace.c

+310 −69

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE