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

Commit 26276089 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

Improvements for 'perf annotate' from Namhyung Kim.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 737f24bd ff2a6617

tools/perf/Makefile

+14 −0
Original line number Diff line number Diff line
@@ -15,6 +15,16 @@ endif 


# Define V to have a more verbose compile.

#

# Define O to save output files in a separate directory.

#

# Define ARCH as name of target architecture if you want cross-builds.

#

# Define CROSS_COMPILE as prefix name of compiler if you want cross-builds.

#

# Define NO_LIBPERL to disable perl script extension.

#

# Define NO_LIBPYTHON to disable python script extension.

#

# Define PYTHON to point to the python binary if the default

# `python' is not correct; for example: PYTHON=python2

#
@@ -32,6 +42,10 @@ endif 
# Define NO_DWARF if you do not want debug-info analysis feature at all.

#

# Define WERROR=0 to disable treating any warnings as errors.

#

# Define NO_NEWT if you do not want TUI support.

#

# Define NO_DEMANGLE if you do not want C++ symbol demangling.



$(OUTPUT)PERF-VERSION-FILE: .FORCE-PERF-VERSION-FILE

	@$(SHELL_PATH) util/PERF-VERSION-GEN $(OUTPUT)

tools/perf/util/annotate.c

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ int symbol__annotate(struct symbol *sym, struct map *map, size_t privsize) 
		       "Please use:\n\n"

		       "  perf buildid-cache -av vmlinux\n\n"

		       "or:\n\n"

		       "  --vmlinux vmlinux",

		       "  --vmlinux vmlinux\n",

		       sym->name, build_id_msg ?: "");

		goto out_free_filename;

	}

tools/perf/util/evlist.c

+1 −0
Original line number Diff line number Diff line
@@ -765,6 +765,7 @@ int perf_evlist__open(struct perf_evlist *evlist, bool group) 
	list_for_each_entry_reverse(evsel, &evlist->entries, node)

		perf_evsel__close(evsel, ncpus, nthreads);



	errno = -err;

	return err;

}

tools/perf/util/ui/browsers/annotate.c

+12 −6
Original line number Diff line number Diff line
@@ -69,14 +69,17 @@ static void annotate_browser__write(struct ui_browser *self, void *entry, int ro 
	if (!self->navkeypressed)

		width += 1;



	if (!ab->hide_src_code && ol->offset != -1)

		if (!current_entry || (self->use_navkeypressed &&

				       !self->navkeypressed))

			ui_browser__set_color(self, HE_COLORSET_CODE);



	if (!*ol->line)

		slsmg_write_nstring(" ", width - 18);

	else

		slsmg_write_nstring(ol->line, width - 18);



	if (!current_entry)

		ui_browser__set_color(self, HE_COLORSET_CODE);

	else

	if (current_entry)

		ab->selection = ol;

}
@@ -230,9 +233,9 @@ static int annotate_browser__run(struct annotate_browser *self, int evidx, 
	struct rb_node *nd = NULL;

	struct map_symbol *ms = self->b.priv;

	struct symbol *sym = ms->sym;

	const char *help = "<-, ESC: exit, TAB/shift+TAB: cycle hottest lines, "

			   "H: Hottest, -> Line action, S -> Toggle source "

			   "code view";

	const char *help = "<-/ESC: Exit, TAB/shift+TAB: Cycle hot lines, "

			   "H: Go to hottest line, ->/ENTER: Line action, "

			   "S: Toggle source code view";

	int key;



	if (ui_browser__show(&self->b, sym->name, help) < 0)
@@ -284,9 +287,11 @@ static int annotate_browser__run(struct annotate_browser *self, int evidx, 
				nd = self->curr_hot;

			break;

		case 'H':

		case 'h':

			nd = self->curr_hot;

			break;

		case 'S':

		case 's':

			if (annotate_browser__toggle_source(self))

				ui_helpline__puts(help);

			continue;
@@ -338,6 +343,7 @@ static int annotate_browser__run(struct annotate_browser *self, int evidx, 
				pthread_mutex_unlock(&notes->lock);

				symbol__tui_annotate(target, ms->map, evidx,

						     timer, arg, delay_secs);

				ui_browser__show_title(&self->b, sym->name);

			}

			continue;

		case K_LEFT: