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

Commit 01306699 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo-20161017' of... 

Merge tag 'perf-urgent-for-mingo-20161017' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

- Fix handling of NUMA nodes in perf.data files (Jiri Olsa)

- Fix scrolling when refreshing 'perf top --tui --hierarchy' entries (Namhyung Kim)

- Fix building of JIT support on Ubuntu 16.04 (Anton Blanchard)

- Fix handling of events including .c and .o, that were being treated as
  BPF scripts instead of vendor ones (Wang Nan)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 5c38181c 53613e00

tools/perf/jvmti/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ SOLIBEXT=so 
# The following works at least on fedora 23, you may need the next

# line for other distros.

ifneq (,$(wildcard /usr/sbin/update-java-alternatives))

JDIR=$(shell /usr/sbin/update-java-alternatives -l | head -1 | cut -d ' ' -f 3)

JDIR=$(shell /usr/sbin/update-java-alternatives -l | head -1 | awk '{print $$3}')

else

  ifneq (,$(wildcard /usr/sbin/alternatives))

    JDIR=$(shell alternatives --display java | tail -1 | cut -d' ' -f 5 | sed 's%/jre/bin/java.%%g')

tools/perf/ui/browsers/hists.c

+2 −1
Original line number Diff line number Diff line
@@ -601,7 +601,8 @@ int hist_browser__run(struct hist_browser *browser, const char *help) 
			u64 nr_entries;

			hbt->timer(hbt->arg);



			if (hist_browser__has_filter(browser))

			if (hist_browser__has_filter(browser) ||

			    symbol_conf.report_hierarchy)

				hist_browser__update_nr_entries(browser);



			nr_entries = hist_browser__nr_entries(browser);

tools/perf/util/header.c

+1 −1
Original line number Diff line number Diff line
@@ -1895,7 +1895,6 @@ static int process_numa_topology(struct perf_file_section *section __maybe_unuse 
	if (ph->needs_swap)

		nr = bswap_32(nr);



	ph->env.nr_numa_nodes = nr;

	nodes = zalloc(sizeof(*nodes) * nr);

	if (!nodes)

		return -ENOMEM;
@@ -1932,6 +1931,7 @@ static int process_numa_topology(struct perf_file_section *section __maybe_unuse 


		free(str);

	}

	ph->env.nr_numa_nodes = nr;

	ph->env.numa_nodes = nodes;

	return 0;

tools/perf/util/parse-events.l

+2 −2
Original line number Diff line number Diff line
@@ -136,8 +136,8 @@ do { \ 
group		[^,{}/]*[{][^}]*[}][^,{}/]*

event_pmu	[^,{}/]+[/][^/]*[/][^,{}/]*

event		[^,{}/]+

bpf_object	.*\.(o|bpf)

bpf_source	.*\.c

bpf_object	[^,{}]+\.(o|bpf)

bpf_source	[^,{}]+\.c



num_dec		[0-9]+

num_hex		0x[a-fA-F0-9]+