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

Commit 27451700 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:

User visible changes:

  - Move toggling event logic from 'perf top' and into hists browser, allowing
    freeze/unfreeze with event lists with more than one entry (Namhyung Kim)

  - Add missing newlines when dumping PERF_RECORD_FINISHED_ROUND and
    showing the Aggregated stats in 'perf report -D' (Adrian Hunter)

Infrastructure changes:

  - Allow auxtrace data alignment (Adrian Hunter)

  - Allow events with dot (Andi Kleen)

  - Fix failure to 'perf probe' events on arm (He Kuang)

  - Add testing for Makefile.perf (Jiri Olsa)

  - Add test for make install with prefix (Jiri Olsa)

  - Fix single target build dependency check (Jiri Olsa)

  - Access thread_map entries via accessors, prep patch to hold more info per
    entry, for ongoing 'perf stat --per-thread' work (Jiri Olsa)

  - Use __weak definition from compiler.h (Sukadev Bhattiprolu)

  - Split perf_pmu__new_alias() (Sukadev Bhattiprolu)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 407a2c72 83b2ea25

tools/perf/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ build-test: 
#

# All other targets get passed through:

#

%:

%: FORCE

	$(print_msg)

	$(make)



.PHONY: tags TAGS
 
.PHONY: tags TAGS FORCE Makefile

tools/perf/builtin-top.c

+3 −21
Original line number Diff line number Diff line
@@ -586,28 +586,10 @@ static void *display_thread_tui(void *arg) 
		hists->uid_filter_str = top->record_opts.target.uid_str;

	}



	while (true)  {

		int key = perf_evlist__tui_browse_hists(top->evlist, help, &hbt,

	perf_evlist__tui_browse_hists(top->evlist, help, &hbt,

				      top->min_percent,

				      &top->session->header.env);



		if (key != 'f')

			break;



		perf_evlist__toggle_enable(top->evlist);

		/*

		 * No need to refresh, resort/decay histogram entries

		 * if we are not collecting samples:

		 */

		if (top->evlist->enabled) {

			hbt.refresh = top->delay_secs;

			help = "Press 'f' to disable the events or 'h' to see other hotkeys";

		} else {

			help = "Press 'f' again to re-enable the events";

			hbt.refresh = 0;

		}

	}



	done = 1;

	return NULL;

}

tools/perf/builtin-trace.c

+2 −2
Original line number Diff line number Diff line
@@ -2325,7 +2325,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) 
	 */

	if (trace->filter_pids.nr > 0)

		err = perf_evlist__set_filter_pids(evlist, trace->filter_pids.nr, trace->filter_pids.entries);

	else if (evlist->threads->map[0] == -1)

	else if (thread_map__pid(evlist->threads, 0) == -1)

		err = perf_evlist__set_filter_pid(evlist, getpid());



	if (err < 0) {
@@ -2343,7 +2343,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) 
	if (forks)

		perf_evlist__start_workload(evlist);



	trace->multiple_threads = evlist->threads->map[0] == -1 ||

	trace->multiple_threads = thread_map__pid(evlist->threads, 0) == -1 ||

				  evlist->threads->nr > 1 ||

				  perf_evlist__first(evlist)->attr.inherit;

again:

tools/perf/tests/make

+28 −3
Original line number Diff line number Diff line 
ifndef MK

ifeq ($(MAKECMDGOALS),)

# no target specified, trigger the whole suite

all:

	@echo "Testing Makefile";      $(MAKE) -sf tests/make MK=Makefile

	@echo "Testing Makefile.perf"; $(MAKE) -sf tests/make MK=Makefile.perf

else

# run only specific test over 'Makefile'

%:

	@echo "Testing Makefile";      $(MAKE) -sf tests/make MK=Makefile $@

endif

else

PERF := .

MK   := Makefile



include config/Makefile.arch
@@ -47,6 +58,7 @@ make_install_man := install-man 
make_install_html   := install-html

make_install_info   := install-info

make_install_pdf    := install-pdf

make_install_prefix := install prefix=/tmp/krava

make_static         := LDFLAGS=-static



# all the NO_* variable combined
@@ -57,7 +69,12 @@ make_minimal += NO_LIBDW_DWARF_UNWIND=1 NO_AUXTRACE=1 


# $(run) contains all available tests

run := make_pure

# Targets 'clean all' can be run together only through top level

# Makefile because we detect clean target in Makefile.perf and

# disable features detection

ifeq ($(MK),Makefile)

run += make_clean_all

endif

run += make_python_perf_so

run += make_debug

run += make_no_libperl
@@ -83,6 +100,7 @@ run += make_util_map_o 
run += make_util_pmu_bison_o

run += make_install

run += make_install_bin

run += make_install_prefix

# FIXME 'install-*' commented out till they're fixed

# run += make_install_doc

# run += make_install_man
@@ -157,6 +175,12 @@ test_make_install_O := $(call test_dest_files,$(installed_files_all)) 
test_make_install_bin   := $(call test_dest_files,$(installed_files_bin))

test_make_install_bin_O := $(call test_dest_files,$(installed_files_bin))



# We prefix all installed files for make_install_prefix

# with '/tmp/krava' to match installed/prefix-ed files.

installed_files_all_prefix := $(addprefix /tmp/krava/,$(installed_files_all))

test_make_install_prefix   := $(call test_dest_files,$(installed_files_all_prefix))

test_make_install_prefix_O := $(call test_dest_files,$(installed_files_all_prefix))



# FIXME nothing gets installed

test_make_install_man    := test -f $$TMP_DEST/share/man/man1/perf.1

test_make_install_man_O  := $(test_make_install_man)
@@ -244,3 +268,4 @@ out: $(run_O) 
	@echo OK



.PHONY: all $(run) $(run_O) tarpkg clean

endif # ifndef MK

tools/perf/tests/openat-syscall-tp-fields.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ int test__syscall_openat_tp_fields(void) 


	perf_evsel__config(evsel, &opts);



	evlist->threads->map[0] = getpid();

	thread_map__set_pid(evlist->threads, 0, getpid());



	err = perf_evlist__open(evlist);

	if (err < 0) {