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

Commit 32c46e57 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 improvements from Arnaldo Carvalho de Melo:

 * Replace event_name with perf_evsel__name, that handles the event
   modifiers and doesn't use static variables.

 * GTK browser improvements, from Namhyung Kim

 * Fix possible NULL pointer deref in the TUI annotate browser, from
   Samuel Liao

 * Add sort by source file:line number, using addr2line.

 * Allow printing histogram text snapshots at any point in top/report.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 2992c542 c0a58fb2

tools/perf/Documentation/perf-report.txt

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ OPTIONS 


-s::

--sort=::

	Sort by key(s): pid, comm, dso, symbol, parent.

	Sort by key(s): pid, comm, dso, symbol, parent, srcline.



-p::

--parent=<regex>::

tools/perf/Documentation/perf-top.txt

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ Default is to monitor all CPUS. 


-s::

--sort::

	Sort by key(s): pid, comm, dso, symbol, parent

	Sort by key(s): pid, comm, dso, symbol, parent, srcline.



-n::

--show-nr-samples::

tools/perf/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -503,6 +503,7 @@ else 
		LIB_OBJS += $(OUTPUT)ui/progress.o

		LIB_OBJS += $(OUTPUT)ui/util.o

		LIB_OBJS += $(OUTPUT)ui/tui/setup.o

		LIB_OBJS += $(OUTPUT)ui/tui/util.o

		LIB_H += ui/browser.h

		LIB_H += ui/browsers/map.h

		LIB_H += ui/helpline.h
@@ -522,13 +523,18 @@ else 
		msg := $(warning GTK2 not found, disables GTK2 support. Please install gtk2-devel or libgtk2.0-dev);

		BASIC_CFLAGS += -DNO_GTK2_SUPPORT

	else

		ifeq ($(call try-cc,$(SOURCE_GTK2_INFOBAR),$(FLAGS_GTK2)),y)

			BASIC_CFLAGS += -DHAVE_GTK_INFO_BAR

		endif

		BASIC_CFLAGS += $(shell pkg-config --cflags gtk+-2.0)

		EXTLIBS += $(shell pkg-config --libs gtk+-2.0)

		LIB_OBJS += $(OUTPUT)ui/gtk/browser.o

		LIB_OBJS += $(OUTPUT)ui/gtk/setup.o

		LIB_OBJS += $(OUTPUT)ui/gtk/util.o

		# Make sure that it'd be included only once.

		ifneq ($(findstring -DNO_NEWT_SUPPORT,$(BASIC_CFLAGS)),)

			LIB_OBJS += $(OUTPUT)ui/setup.o

			LIB_OBJS += $(OUTPUT)ui/util.o

		endif

	endif

endif

tools/perf/builtin-evlist.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static int __cmd_evlist(const char *input_name, struct perf_attr_details *detail 
	list_for_each_entry(pos, &session->evlist->entries, node) {

		bool first = true;



		printf("%s", event_name(pos));

		printf("%s", perf_evsel__name(pos));



		if (details->verbose || details->freq) {

			comma_printf(&first, " sample_freq=%" PRIu64,

tools/perf/builtin-record.c

+2 −2
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static void perf_record__open(struct perf_record *rec) 


			if (err == ENOENT) {

				ui__error("The %s event is not supported.\n",

					    event_name(pos));

					  perf_evsel__name(pos));

				exit(EXIT_FAILURE);

			}
@@ -916,7 +916,7 @@ int cmd_record(int argc, const char **argv, const char *prefix __used) 
		usage_with_options(record_usage, record_options);



	list_for_each_entry(pos, &evsel_list->entries, node) {

		if (perf_header__push_event(pos->attr.config, event_name(pos)))

		if (perf_header__push_event(pos->attr.config, perf_evsel__name(pos)))

			goto out_free_fd;

	}