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

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

Merge tag 'perf-core-for-mingo-2' of... 

Merge tag 'perf-core-for-mingo-2' 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:

  - List perf probes to stdout. (Masami Hiramatsu)

  - Return error when none of the requested probes were
    installed. (Masami Hiramatsu)

  - Cut off the gcc optimization postfixes from
    function name in 'perf probe'. (Masami Hiramatsu)

  - Allow disabling/enabling events dynamicly in 'perf top':
    a 'perf top' session can instantly become a 'perf report'
    one, i.e. going from dynamic analysis to a static one,
    returning to a dynamic one is possible, to toogle the
    modes, just press CTRL+z. (Arnaldo Carvalho de Melo)

  - Greatly speed up 'perf probe --list' by caching debuginfo.
    (Masami Hiramatsu)

  - Fix 'perf trace' race condition at the end of started
    workloads. (Sukadev Bhattiprolu)

  - Fix a problem when opening old perf.data with different
    byte order. (Wang Nan)

Infrastructure changes:

  - Replace map->referenced & maps->removed_maps with
    map->refcnt. (Arnaldo Carvalho de Melo)

  - Introduce the xyarray__reset() function. (Jiri Olsa)

  - Add thread_map__(alloc|realloc)() helpers. (Jiri Olsa)

  - Move perf_evsel__(alloc|free|reset)_counts into stat object. (Jiri Olsa)

  - Introduce perf_counts__(new|delete|reset)() functions. (Jiri Olsa)

  - Ignore .config-detected in .gitignore. (Wang Nan)

  - Move libtraceevent dynamic list to separated LDFLAGS
    variable. (Wang Nan)

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

tools/perf/.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -28,3 +28,4 @@ config.mak.autogen 
*-flex.*

*.pyc

*.pyo

.config-detected

tools/perf/Makefile.perf

+6 −4
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ LIBTRACEEVENT = $(TE_PATH)libtraceevent.a 
export LIBTRACEEVENT



LIBTRACEEVENT_DYNAMIC_LIST = $(TE_PATH)libtraceevent-dynamic-list

LDFLAGS += -Xlinker --dynamic-list=$(LIBTRACEEVENT_DYNAMIC_LIST)

LIBTRACEEVENT_DYNAMIC_LIST_LDFLAGS = -Xlinker --dynamic-list=$(LIBTRACEEVENT_DYNAMIC_LIST)



LIBAPI = $(LIB_PATH)libapi.a

export LIBAPI
@@ -190,8 +190,9 @@ python-clean := $(call QUIET_CLEAN, python) $(RM) -r $(PYTHON_EXTBUILD) $(OUTPUT 
PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources)

PYTHON_EXT_DEPS := util/python-ext-sources util/setup.py $(LIBTRACEEVENT) $(LIBAPI)



$(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS)

	$(QUIET_GEN)CFLAGS='$(CFLAGS)' $(PYTHON_WORD) util/setup.py \

$(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS) $(LIBTRACEEVENT_DYNAMIC_LIST)

	$(QUIET_GEN)CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS) $(LIBTRACEEVENT_DYNAMIC_LIST_LDFLAGS)' \

	  $(PYTHON_WORD) util/setup.py \

	  --quiet build_ext; \

	mkdir -p $(OUTPUT)python && \

	cp $(PYTHON_EXTBUILD_LIB)perf.so $(OUTPUT)python/
@@ -282,7 +283,8 @@ $(PERF_IN): $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h FORCE 
	$(Q)$(MAKE) $(build)=perf



$(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) $(LIBTRACEEVENT_DYNAMIC_LIST)

	$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(PERF_IN) $(LIBS) -o $@

	$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBTRACEEVENT_DYNAMIC_LIST_LDFLAGS) \

		$(PERF_IN) $(LIBS) -o $@



$(GTK_IN): FORCE

	$(Q)$(MAKE) $(build)=gtk

tools/perf/builtin-stat.c

+7 −12
Original line number Diff line number Diff line
@@ -178,24 +178,19 @@ static void perf_evsel__free_stat_priv(struct perf_evsel *evsel) 


static int perf_evsel__alloc_prev_raw_counts(struct perf_evsel *evsel)

{

	void *addr;

	size_t sz;

	struct perf_counts *counts;



	sz = sizeof(*evsel->counts) +

	     (perf_evsel__nr_cpus(evsel) * sizeof(struct perf_counts_values));

	counts = perf_counts__new(perf_evsel__nr_cpus(evsel));

	if (counts)

		evsel->prev_raw_counts = counts;



	addr = zalloc(sz);

	if (!addr)

		return -ENOMEM;



	evsel->prev_raw_counts =  addr;



	return 0;

	return counts ? 0 : -ENOMEM;

}



static void perf_evsel__free_prev_raw_counts(struct perf_evsel *evsel)

{

	zfree(&evsel->prev_raw_counts);

	perf_counts__delete(evsel->prev_raw_counts);

	evsel->prev_raw_counts = NULL;

}



static void perf_evlist__free_stats(struct perf_evlist *evlist)

tools/perf/builtin-top.c

+36 −16
Original line number Diff line number Diff line
@@ -235,10 +235,13 @@ static void perf_top__show_details(struct perf_top *top) 


	more = symbol__annotate_printf(symbol, he->ms.map, top->sym_evsel,

				       0, top->sym_pcnt_filter, top->print_entries, 4);



	if (top->evlist->enabled) {

		if (top->zero)

			symbol__annotate_zero_histogram(symbol, top->sym_evsel->idx);

		else

			symbol__annotate_decay_histogram(symbol, top->sym_evsel->idx);

	}

	if (more != 0)

		printf("%d lines not displayed, maybe increase display entries [e]\n", more);

out_unlock:
@@ -276,12 +279,14 @@ static void perf_top__print_sym_table(struct perf_top *top) 
		return;

	}



	if (top->evlist->enabled) {

		if (top->zero) {

			hists__delete_entries(hists);

		} else {

			hists__decay_entries(hists, top->hide_user_symbols,

					     top->hide_kernel_symbols);

		}

	}



	hists__collapse_resort(hists, NULL);

	hists__output_resort(hists, NULL);
@@ -545,12 +550,14 @@ static void perf_top__sort_new_samples(void *arg) 


	hists = evsel__hists(t->sym_evsel);



	if (t->evlist->enabled) {

		if (t->zero) {

			hists__delete_entries(hists);

		} else {

			hists__decay_entries(hists, t->hide_user_symbols,

					     t->hide_kernel_symbols);

		}

	}



	hists__collapse_resort(hists, NULL);

	hists__output_resort(hists, NULL);
@@ -579,9 +586,22 @@ static void *display_thread_tui(void *arg) 
		hists->uid_filter_str = top->record_opts.target.uid_str;

	}



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

	while (true)  {

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

							top->min_percent,

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



		if (key != CTRL('z'))

			break;



		perf_evlist__toggle_enable(top->evlist);

		/*

		 * No need to refresh, resort/decay histogram entries

		 * if we are not collecting samples:

		 */

		hbt.refresh = top->evlist->enabled ? top->delay_secs : 0;

	}



	done = 1;

	return NULL;

}

tools/perf/tests/openat-syscall-all-cpus.c

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include "thread_map.h"

#include "cpumap.h"

#include "debug.h"

#include "stat.h"



int test__openat_syscall_event_on_all_cpus(void)

{