perf updates
Subsystems (2)
Linus,
Please pull the latest perf-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus
# HEAD: b9df84fd7c05cc300d6d14f022b8a00773ebcf8c Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
This tree includes an x86 PMU scheduling fix, but most changes are late breaking tooling fixes and updates:
User visible fixes:
- Create config.detected into OUTPUT directory, fixing parallel builds sharing the same source directory (Aaro Kiskinen)
- Allow to specify custom linker command, fixing some MIPS64 builds. (Aaro Kiskinen)
- Fix to show proper convergence stats in 'perf bench numa' (Srikar Dronamraju)
User visible changes:
- Validate syscall list passed via -e argument to 'perf trace'. (Arnaldo Carvalho de Melo)
- Introduce 'perf stat --per-thread'. (Jiri Olsa)
- Check access permission for --kallsyms and --vmlinux. (Li Zhang)
- 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 fixes:
- Add missing break for PERF_RECORD_ITRACE_START, which caused those events samples to be parsed as well as PERF_RECORD_LOST_SAMPLES. ITRACE_START only appears when Intel PT or BTS are present, so (Jiri Olsa)
- Call the perf_session destructor when bailing out in the inject, kmem, report, kvm and mem tools (Taeung Song)
Infrastructure changes:
- Move stuff out of 'perf stat' and into the lib for further use. (Jiri Olsa)
- Reference count the cpu_map and thread_map classes. (Jiri Olsa)
- Set evsel->{cpus,threads} from the evlist, if not set, allowing the generalization of some 'perf stat' functions that previously were accessing private static evlist variable. (Jiri Olsa)
- Delete an unnecessary check before the calling free_event_desc() (Markus Elfring)
- 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)
Thanks,
Ingo
------------------>
Aaro Koskinen (2):
perf tools: Create config.detected into OUTPUT directory perf tools: Allow to specify custom linker command
Adrian Hunter (3):
perf session: Print a newline when dumping PERF_RECORD_FINISHED_ROUND perf tools: Print a newline before dumping Aggregated stats perf tools: Allow auxtrace data alignment
Andi Kleen (1):
perf tools: Allow events with dot
Arnaldo Carvalho de Melo (2):
perf tools: Future-proof thread_map allocation size calculation perf trace: Validate syscall list passed via -e argument
He Kuang (1):
perf probe: Fix failure to probe events on arm
Jiri Olsa (33):
perf tests: Add testing for Makefile.perf
perf tests: Add test for make install with prefix
perf build: Fix single target build dependency check
perf thread_map: Don't access the array entries directly perf thread_map: Change map entries into a struct
perf tools: Add reference counting for cpu_map object
perf tools: Add reference counting for thread_map object perf evlist: Propagate cpu maps to evsels in an evlist
perf evlist: Propagate thread maps through the evlist
perf tools: Make perf_evsel__(nr_)cpus generic
perf thread_map: Introduce thread_map__reset function
perf thrad_map: Add comm string into array
perf tests: Add thread_map object tests
perf stat: Introduce perf_counts function
perf stat: Use xyarray for cpu evsel counts
perf stat: Make stats work over the thread dimension
perf stat: Rename struct perf_counts::cpu member to values perf stat: Introduce perf_evlist__reset_stats
perf stat: Move perf_evsel__(alloc|free|reset)_stat_priv into stat object perf stat: Move perf_evsel__(alloc|free)_prev_raw_counts into stat object perf stat: Move perf_evlist__(alloc|free|reset)_stats into stat object perf stat: Introduce perf_evsel__alloc_stats function
perf stat: Introduce perf_evsel__read function
perf stat: Introduce read_counters function
perf stat: Separate counters reading and processing
perf stat: Move zero_per_pkg into counter process code
perf stat: Move perf_stat initialization counter process code perf stat: Remove perf_evsel__read_cb function
perf stat: Rename print_interval to process_interval
perf stat: Using init_stats instead of memset
perf stat: Introduce print_counters function
perf stat: Introduce --per-thread option
perf tools: Add missing break for PERF_RECORD_ITRACE_START
Li Zhang (1):
perf symbols: Check access permission when reading symbol files
Markus Elfring (1):
perf header: Delete an unnecessary check before the calling free_event_desc()
Namhyung Kim (1):
perf top: Move toggling event logic into hists browser
Peter Zijlstra (1):
perf/x86: Fix 'active_events' imbalance
Srikar Dronamraju (1):
perf bench numa: Fix to show proper convergence stats
Sukadev Bhattiprolu (2):
perf pmu: Use __weak definition from <linux/compiler.h> perf pmu: Split perf_pmu__new_alias()
Taeung Song (5):
perf inject: Fill in the missing session freeing after an error occurs perf kmem: Fill in the missing session freeing after an error occurs perf report: Fill in the missing session freeing after an error occurs perf kvm: Fill in the missing session freeing after an error occurs perf mem: Fill in the missing session freeing after an error occurs
arch/x86/kernel/cpu/perf_event.c | 36 +-- tools/build/Makefile.build | 2 +- tools/perf/Documentation/perf-stat.txt | 4 + tools/perf/Makefile | 4 +- tools/perf/Makefile.perf | 4 +- tools/perf/builtin-inject.c | 7 +- tools/perf/builtin-kmem.c | 4 +- tools/perf/builtin-kvm.c | 14 +- tools/perf/builtin-mem.c | 16 +- tools/perf/builtin-report.c | 17 +- tools/perf/builtin-stat.c | 412 ++++++++++++++-------------- tools/perf/builtin-top.c | 24 +- tools/perf/builtin-trace.c | 36 ++- tools/perf/config/Makefile | 6 +- tools/perf/tests/Build | 1 + tools/perf/tests/builtin-test.c | 4 + tools/perf/tests/code-reading.c | 4 +- tools/perf/tests/keep-tracking.c | 4 +- tools/perf/tests/make | 31 ++- tools/perf/tests/mmap-basic.c | 4 +- tools/perf/tests/mmap-thread-lookup.c | 2 +- tools/perf/tests/openat-syscall-all-cpus.c | 8 +- tools/perf/tests/openat-syscall-tp-fields.c | 2 +- tools/perf/tests/openat-syscall.c | 6 +- tools/perf/tests/switch-tracking.c | 4 +- tools/perf/tests/tests.h | 1 + tools/perf/tests/thread-map.c | 38 +++ tools/perf/ui/browsers/hists.c | 19 +- tools/perf/util/auxtrace.c | 11 +- tools/perf/util/auxtrace.h | 1 + tools/perf/util/cloexec.c | 4 + tools/perf/util/cpumap.c | 26 +- tools/perf/util/cpumap.h | 6 +- tools/perf/util/event.c | 6 +- tools/perf/util/evlist.c | 39 ++- tools/perf/util/evlist.h | 1 - tools/perf/util/evsel.c | 28 +- tools/perf/util/evsel.h | 40 ++- tools/perf/util/header.c | 3 +- tools/perf/util/machine.c | 3 +- tools/perf/util/parse-events.c | 5 +- tools/perf/util/parse-events.l | 5 +- tools/perf/util/pmu.c | 45 +-- tools/perf/util/probe-event.c | 6 +- tools/perf/util/python-ext-sources | 1 + tools/perf/util/python.c | 4 +- tools/perf/util/record.c | 4 +- tools/perf/util/session.c | 6 +- tools/perf/util/stat.c | 132 ++++++++- tools/perf/util/stat.h | 47 +++- tools/perf/util/svghelper.c | 2 +- tools/perf/util/symbol.c | 5 +- tools/perf/util/thread_map.c | 132 ++++++++- tools/perf/util/thread_map.h | 31 ++- 54 files changed, 885 insertions(+), 422 deletions(-) create mode 100644 tools/perf/tests/thread-map.c
arch/x86/kernel/cpu/perf_event.c +13 -23
@@ -357,34 +357,24 @@ void x86_release_hardware(void)*/ int x86_add_exclusive (unsigned int what) { -int ret = -EBUSY , i; - -if (atomic_inc_not_zero (&x86_pmu.lbr_exclusive[what])) -return 0 ; +int i; -mutex_lock (&pmc_reserve_mutex); -for (i =0 ; i <ARRAY_SIZE (x86_pmu.lbr_exclusive); i++) { -if (i != what &&atomic_read (&x86_pmu.lbr_exclusive[i])) - goto out; +if (!atomic_inc_not_zero (&x86_pmu.lbr_exclusive[what])) { +mutex_lock (&pmc_reserve_mutex); +for (i =0 ; i <ARRAY_SIZE (x86_pmu.lbr_exclusive); i++) { +if (i != what &&atomic_read (&x86_pmu.lbr_exclusive[i])) + goto fail_unlock; + } +atomic_inc (&x86_pmu.lbr_exclusive[what]); +mutex_unlock (&pmc_reserve_mutex); } -atomic_inc (&x86_pmu.lbr_exclusive[what]); - ret =0 ; +atomic_inc (&active_events); +return 0 ; -out: +fail_unlock:mutex_unlock (&pmc_reserve_mutex); - -/* -* Assuming that all exclusive events will share the PMI handler -* (which checks active_events for whether there is work to do), -* we can bump active_events counter right here, except for -* x86_lbr_exclusive_lbr events that go through x86_pmu_event_init() -* path, which already bumps active_events for them. -*/ -if (!ret && what != x86_lbr_exclusive_lbr) -atomic_inc (&active_events); - -return ret; +return -EBUSY ; }void x86_del_exclusive (unsigned int what)
tools/build/Makefile.build +1 -1
@@ -25,7 +25,7 @@ build-dir := $(srctree)/tools/build include $(build-dir)/Build.include # do not force detected configuration --include .config-detected +-include $(OUTPUT).config-detected # Init all relevant variables used in build files so # 1) they have correct type
tools/perf/Documentation/perf-stat.txt +4 -0
@@ -144,6 +144,10 @@ is a useful mode to detect imbalance between physical cores. To enable this mod use --per-core in addition to -a. (system-wide). The output includes the core number and the number of online logical processors on that physical processor. +--per-thread:: +Aggregate counts per monitored threads, when monitoring threads (-t option) +or processes (-p option). + -D msecs:: --delay msecs:: After starting the program, wait msecs before measuring. This is useful to
tools/perf/Makefile +2 -2
@@ -83,8 +83,8 @@ endef # # All other targets get passed through: # -%: +%: FORCE $(print_msg) $(make) -.PHONY: tags TAGS +.PHONY: tags TAGS FORCE Makefile
tools/perf/Makefile.perf +2 -2
@@ -110,7 +110,7 @@ $(OUTPUT)PERF-VERSION-FILE: ../../.git/HEAD $(Q)touch $(OUTPUT)PERF-VERSION-FILE CC = $(CROSS_COMPILE)gcc -LD = $(CROSS_COMPILE)ld +LD ?= $(CROSS_COMPILE)ld AR = $(CROSS_COMPILE)ar PKG_CONFIG = $(CROSS_COMPILE)pkg-config
@@ -545,7 +545,7 @@ install: install-bin try-install-man install-traceevent-plugins clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean config-clean $(call QUIET_CLEAN, core-objs) $(RM) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS) $(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete - $(Q)$(RM) .config-detected + $(Q)$(RM) $(OUTPUT).config-detected $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32 $(call QUIET_CLEAN, core-gen) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
tools/perf/builtin-inject.c +4 -3
@@ -630,12 +630,13 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused)if (inject.session ==NULL )return -1 ; -if (symbol__init (&inject.session->header.env) <0 ) -return -1 ; + ret =symbol__init (&inject.session->header.env); +if (ret <0 ) + goto out_delete; ret =__cmd_inject (&inject); +out_delete:perf_session__delete (inject.session); -return ret; }
tools/perf/builtin-kmem.c +2 -2
@@ -1916,7 +1916,7 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused)if (!perf_evlist__find_tracepoint_by_name (session->evlist,"kmem:kmalloc" )) {pr_err (errmsg,"slab" ,"slab" ); -return -1 ; + goto out_delete; } }
@@ -1927,7 +1927,7 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused) "kmem:mm_page_alloc");if (evsel ==NULL ) {pr_err (errmsg,"page" ,"page" ); -return -1 ; + goto out_delete; } kmem_page_size =pevent_get_page_size (evsel->tp_format->pevent);
tools/perf/builtin-kvm.c +10 -4
@@ -1061,8 +1061,10 @@ static int read_events(struct perf_kvm_stat *kvm)symbol__init (&kvm->session->header.env); -if (!perf_session__has_traces (kvm->session,"kvm record" )) -return -EINVAL ; +if (!perf_session__has_traces (kvm->session,"kvm record" )) { + ret = -EINVAL ; + goto out_delete; + }/* * Do not use 'isa' recorded in kvm_exit tracepoint since it is not
@@ -1070,9 +1072,13 @@ static int read_events(struct perf_kvm_stat *kvm)*/ ret =cpu_isa_config (kvm);if (ret <0 ) -return ret; + goto out_delete; -return perf_session__process_events (kvm->session); + ret =perf_session__process_events (kvm->session); + +out_delete: +perf_session__delete (kvm->session); +return ret; }static int parse_target_str (struct perf_kvm_stat *kvm)
tools/perf/builtin-mem.c +6 -10
@@ -124,7 +124,6 @@ static int report_raw_events(struct perf_mem *mem) .mode = PERF_DATA_MODE_READ, .force = mem->force, }; -int err = -EINVAL ;int ret;struct perf_session *session =perf_session__new (&file, false, &mem->tool);
@@ -135,24 +134,21 @@ static int report_raw_events(struct perf_mem *mem)if (mem->cpu_list) { ret =perf_session__cpu_bitmap (session, mem->cpu_list, mem->cpu_bitmap); -if (ret) +if (ret <0 ) goto out_delete; } -if (symbol__init (&session->header.env) <0 ) -return -1 ; + ret =symbol__init (&session->header.env); +if (ret <0 ) + goto out_delete;printf ("# PID, TID, IP, ADDR, LOCAL WEIGHT, DSRC, SYMBOL\n" ); - err =perf_session__process_events (session); -if (err) -return err; - -return 0 ; + ret =perf_session__process_events (session); out_delete:perf_session__delete (session); -return err; +return ret; }static int report_events (int argc,const char **argv,struct perf_mem *mem)
tools/perf/builtin-report.c +15 -2
@@ -742,6 +742,17 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) argc =parse_options (argc, argv, options, report_usage,0 ); +if (symbol_conf.vmlinux_name && +access (symbol_conf.vmlinux_name,R_OK )) { +pr_err ("Invalid file: %s\n" , symbol_conf.vmlinux_name); +return -EINVAL ; + } +if (symbol_conf.kallsyms_name && +access (symbol_conf.kallsyms_name,R_OK )) { +pr_err ("Invalid file: %s\n" , symbol_conf.kallsyms_name); +return -EINVAL ; + } +if (report.use_stdio) use_browser =0 ;else if (report.use_tui)
@@ -828,8 +839,10 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused)if (report.header || report.header_only) {perf_session__fprintf_info (session, stdout, report.show_full_info); -if (report.header_only) -return 0 ; +if (report.header_only) { + ret =0 ; + goto error; + } }else if (use_browser ==0 ) {fputs ("# To display the perf.data header info, please use --header/--header-only options.\n#\n" , stdout);
tools/perf/builtin-stat.c +207 -205
586 lines not on this page · raw message
tools/perf/builtin-top.c +3 -21
@@ -586,27 +586,9 @@ 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, - 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 ; - } - } +perf_evlist__tui_browse_hists (top->evlist, help, &hbt, + top->min_percent, + &top->session->header.env); done =1 ;return NULL ;
tools/perf/builtin-trace.c +34 -2
@@ -1617,6 +1617,34 @@ static int trace__read_syscall_info(struct trace *trace, int id)return syscall__set_arg_fmts (sc); } +static int trace__validate_ev_qualifier (struct trace *trace) +{ +int err =0 ; +struct str_node *pos; + +strlist__for_each (pos, trace->ev_qualifier) { +const char *sc = pos->s; + +if (audit_name_to_syscall (sc, trace->audit.machine) <0 ) { +if (err ==0 ) { +fputs ("Error:\tInvalid syscall " , trace->output); + err = -EINVAL ; + }else { +fputs (", " , trace->output); + } + +fputs (sc, trace->output); + } + } + +if (err <0 ) { +fputs ("\nHint:\ttry 'perf list syscalls:sys_enter_*'" +"\nHint:\tand: 'man syscalls'\n" , trace->output); + } + +return err; +} +/* * args is to be interpreted as a series of longs but we need to handle * 8-byte unaligned accesses. args points to raw_data within the event
@@ -2325,7 +2353,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 +2371,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:
@@ -2862,6 +2890,10 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused) err = -ENOMEM ; goto out_close; } + + err =trace__validate_ev_qualifier (&trace); +if (err) + goto out_close; } err =target__validate (&trace.opts.target);
tools/perf/config/Makefile +3 -3
@@ -11,9 +11,9 @@ ifneq ($(obj-perf),) obj-perf := $(abspath $(obj-perf))/ endif -$(shell echo -n > .config-detected) -detected = $(shell echo "$(1)=y" >> .config-detected) -detected_var = $(shell echo "$(1)=$($(1))" >> .config-detected) +$(shell echo -n > $(OUTPUT).config-detected) +detected = $(shell echo "$(1)=y" >> $(OUTPUT).config-detected) +detected_var = $(shell echo "$(1)=$($(1))" >> $(OUTPUT).config-detected) CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS)
tools/perf/tests/Build +1 -0
@@ -31,6 +31,7 @@ perf-y += code-reading.o perf-y += sample-parsing.o perf-y += parse-no-sample-id-all.o perf-y += kmod-path.o +perf-y += thread-map.o perf-$(CONFIG_X86) += perf-time-to-tsc.o
tools/perf/tests/builtin-test.c +4 -0
@@ -171,6 +171,10 @@ static struct test { .func = test__kmod_path__parse, }, { + .desc = "Test thread map", + .func = test__thread_map, + }, + { .func = NULL, }, };
tools/perf/tests/code-reading.c +2 -2
@@ -545,8 +545,8 @@ static int do_test_code_reading(bool try_kcore)if (evlist) {perf_evlist__delete (evlist); }else { -cpu_map__delete (cpus); -thread_map__delete (threads); +cpu_map__put (cpus); +thread_map__put (threads); }machines__destroy_kernel_maps (&machines);machine__delete_threads (machine);
tools/perf/tests/keep-tracking.c +2 -2
@@ -144,8 +144,8 @@ int test__keep_tracking(void)perf_evlist__disable (evlist);perf_evlist__delete (evlist); }else { -cpu_map__delete (cpus); -thread_map__delete (threads); +cpu_map__put (cpus); +thread_map__put (threads); }return err;
tools/perf/tests/make +28 -3
@@ -1,5 +1,16 @@ +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)
@@ -226,13 +250,13 @@ clean := @(cd $(PERF); make -s -f $(MK) clean >/dev/null) ( eval $$cmd ) >> $@ 2>&1 make_kernelsrc: - @echo " - make -C <kernelsrc> tools/perf" + @echo "- make -C <kernelsrc> tools/perf" $(call clean); \ (make -C ../.. tools/perf) > $@ 2>&1 && \ test -x perf && rm -f $@ || (cat $@ ; false) make_kernelsrc_tools: - @echo " - make -C <kernelsrc>/tools perf" + @echo "- make -C <kernelsrc>/tools perf" $(call clean); \ (make -C ../../tools perf) > $@ 2>&1 && \ test -x perf && rm -f $@ || (cat $@ ; false)
@@ -244,3 +268,4 @@ out: $(run_O) @echo OK .PHONY: all $(run) $(run_O) tarpkg clean +endif # ifndef MK
tools/perf/tests/mmap-basic.c +2 -2
@@ -140,8 +140,8 @@ int test__basic_mmap(void) cpus =NULL ; threads =NULL ; out_free_cpus: -cpu_map__delete (cpus); +cpu_map__put (cpus); out_free_threads: -thread_map__delete (threads); +thread_map__put (threads);return err; }
tools/perf/tests/mmap-thread-lookup.c +1 -1
@@ -143,7 +143,7 @@ static int synth_process(struct machine *machine) perf_event__process, machine, 0, 500); -thread_map__delete (map); +thread_map__put (map);return err; }
tools/perf/tests/openat-syscall-all-cpus.c +4 -4
@@ -78,7 +78,7 @@ int test__openat_syscall_event_on_all_cpus(void)* we use the auto allocation it will allocate just for 1 cpu, * as we start by cpu 0. */ -if (perf_evsel__alloc_counts (evsel, cpus->nr) <0 ) { +if (perf_evsel__alloc_counts (evsel, cpus->nr,1 ) <0 ) {pr_debug ("perf_evsel__alloc_counts(ncpus=%d)\n" , cpus->nr); goto out_close_fd; }
@@ -98,9 +98,9 @@ int test__openat_syscall_event_on_all_cpus(void) } expected = nr_openat_calls + cpu; -if (evsel->counts->cpu[cpu].val != expected) { +if (perf_counts (evsel->counts, cpu,0 )->val != expected) {pr_debug ("perf_evsel__read_on_cpu: expected to intercept %d calls on cpu %d, got %" PRIu64"\n" , - expected, cpus->map[cpu], evsel->counts->cpu[cpu].val); + expected, cpus->map[cpu],perf_counts (evsel->counts, cpu,0 )->val); err =-1 ; } }
@@ -111,6 +111,6 @@ int test__openat_syscall_event_on_all_cpus(void) out_evsel_delete:perf_evsel__delete (evsel); out_thread_map_delete: -thread_map__delete (threads); +thread_map__put (threads);return err; }
tools/perf/tests/openat-syscall-tp-fields.c +1 -1
@@ -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 ) {
tools/perf/tests/openat-syscall.c +3 -3
@@ -44,9 +44,9 @@ int test__openat_syscall_event(void) goto out_close_fd; } -if (evsel->counts->cpu[0 ].val != nr_openat_calls) { +if (perf_counts (evsel->counts,0 ,0 )->val != nr_openat_calls) {pr_debug ("perf_evsel__read_on_cpu: expected to intercept %d calls, got %" PRIu64"\n" , - nr_openat_calls, evsel->counts->cpu[0 ].val); + nr_openat_calls,perf_counts (evsel->counts,0 ,0 )->val); goto out_close_fd; }
@@ -56,6 +56,6 @@ int test__openat_syscall_event(void) out_evsel_delete:perf_evsel__delete (evsel); out_thread_map_delete: -thread_map__delete (threads); +thread_map__put (threads);return err; }
tools/perf/tests/switch-tracking.c +2 -2
@@ -560,8 +560,8 @@ int test__switch_tracking(void)perf_evlist__disable (evlist);perf_evlist__delete (evlist); }else { -cpu_map__delete (cpus); -thread_map__delete (threads); +cpu_map__put (cpus); +thread_map__put (threads); }return err;
tools/perf/tests/tests.h +1 -0
@@ -61,6 +61,7 @@ int test__switch_tracking(void);int test__fdarray__filter (void );int test__fdarray__add (void );int test__kmod_path__parse (void ); +int test__thread_map (void );#if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__)#ifdef HAVE_DWARF_UNWIND_SUPPORT
tools/perf/tests/thread-map.c new file +38 -0
@@ -0,0 +1,38 @@ +#include <sys/types.h> +#include <unistd.h> +#include "tests.h" +#include "thread_map.h" +#include "debug.h" + +int test__thread_map (void ) +{ +struct thread_map *map; + +/* test map on current pid */ + map =thread_map__new_by_pid (getpid ()); +TEST_ASSERT_VAL ("failed to alloc map" , map); + +thread_map__read_comms (map); + +TEST_ASSERT_VAL ("wrong nr" , map->nr ==1 ); +TEST_ASSERT_VAL ("wrong pid" , +thread_map__pid (map,0 ) ==getpid ()); +TEST_ASSERT_VAL ("wrong comm" , +thread_map__comm (map,0 ) && + !strcmp (thread_map__comm (map,0 ),"perf" )); +thread_map__put (map); + +/* test dummy pid */ + map =thread_map__new_dummy (); +TEST_ASSERT_VAL ("failed to alloc map" , map); + +thread_map__read_comms (map); + +TEST_ASSERT_VAL ("wrong nr" , map->nr ==1 ); +TEST_ASSERT_VAL ("wrong pid" ,thread_map__pid (map,0 ) ==-1 ); +TEST_ASSERT_VAL ("wrong comm" , +thread_map__comm (map,0 ) && + !strcmp (thread_map__comm (map,0 ),"dummy" )); +thread_map__put (map); +return 0 ; +}
tools/perf/ui/browsers/hists.c +17 -2
@@ -1902,8 +1902,23 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,case CTRL ('c' ): goto out_free_stack;case 'f' : -if (!is_report_browser (hbt)) - goto out_free_stack; +if (!is_report_browser (hbt)) { +struct perf_top *top = hbt->arg; + +perf_evlist__toggle_enable (top->evlist); +/* +* No need to refresh, resort/decay histogram +* entries if we are not collecting samples: +*/ +if (top->evlist->enabled) { + helpline ="Press 'f' to disable the events or 'h' to see other hotkeys" ; + hbt->refresh = delay_secs; + }else { + helpline ="Press 'f' again to re-enable the events" ; + hbt->refresh =0 ; + } +continue ; + }/* Fall thru */ default : helpline ="Press '?' for help on key bindings" ;
tools/perf/util/auxtrace.c +9 -2
@@ -119,12 +119,12 @@ void auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp,if (per_cpu) { mp->cpu = evlist->cpus->map[idx];if (evlist->threads) - mp->tid = evlist->threads->map[0 ]; + mp->tid =thread_map__pid (evlist->threads,0 );else mp->tid =-1 ; }else { mp->cpu =-1 ; - mp->tid = evlist->threads->map[idx]; + mp->tid =thread_map__pid (evlist->threads, idx); } }
@@ -1182,6 +1182,13 @@ static int __auxtrace_mmap__read(struct auxtrace_mmap *mm, data2 =NULL ; } +if (itr->alignment) { +unsigned int unwanted = len1 % itr->alignment; + + len1 -= unwanted; + size -= unwanted; + } +/* padding must be written by fn() e.g. record__process_auxtrace() */ padding = size &7 ;if (padding)
tools/perf/util/auxtrace.h +1 -0
@@ -303,6 +303,7 @@ struct auxtrace_record { const char *str);u64 (*reference)(struct auxtrace_record *itr);int (*read_finish)(struct auxtrace_record *itr,int idx); +unsigned int alignment; };#ifdef HAVE_AUXTRACE_SUPPORT
tools/perf/util/cloexec.c +4 -0
@@ -7,11 +7,15 @@static unsigned long flag =PERF_FLAG_FD_CLOEXEC ; +#ifdef __GLIBC_PREREQ +#if !__GLIBC_PREREQ (2 ,6 )int __weak sched_getcpu (void ) { errno =ENOSYS ;return -1 ; } +#endif +#endif static int perf_flag_probe (void ) {
tools/perf/util/cpumap.c +24 -2
@@ -5,6 +5,7 @@#include <assert.h> #include <stdio.h> #include <stdlib.h> +#include "asm/bug.h" static struct cpu_map *cpu_map__default_new (void ) {
@@ -22,6 +23,7 @@ static struct cpu_map *cpu_map__default_new(void) cpus->map[i] = i; cpus->nr = nr_cpus; +atomic_set (&cpus->refcnt,1 ); }return cpus;
@@ -35,6 +37,7 @@ static struct cpu_map *cpu_map__trim_new(int nr_cpus, int *tmp_cpus)if (cpus !=NULL ) { cpus->nr = nr_cpus;memcpy (cpus->map, tmp_cpus, payload_size); +atomic_set (&cpus->refcnt,1 ); }return cpus;
@@ -194,14 +197,32 @@ struct cpu_map *cpu_map__dummy_new(void)if (cpus !=NULL ) { cpus->nr =1 ; cpus->map[0 ] =-1 ; +atomic_set (&cpus->refcnt,1 ); }return cpus; } -void cpu_map__delete (struct cpu_map *map) +static void cpu_map__delete (struct cpu_map *map) { -free (map); +if (map) { +WARN_ONCE (atomic_read (&map->refcnt) !=0 , +"cpu_map refcnt unbalanced\n" ); +free (map); + } +} + +struct cpu_map *cpu_map__get (struct cpu_map *map) +{ +if (map) +atomic_inc (&map->refcnt); +return map; +} + +void cpu_map__put (struct cpu_map *map) +{ +if (map &&atomic_dec_and_test (&map->refcnt)) +cpu_map__delete (map); }int cpu_map__get_socket (struct cpu_map *map,int idx)
@@ -263,6 +284,7 @@ static int cpu_map__build_map(struct cpu_map *cpus, struct cpu_map **res,/* ensure we process id in increasing order */ qsort (c->map, c->nr,sizeof (int ), cmp_ids); +atomic_set (&cpus->refcnt,1 ); *res = c;return 0 ; }
tools/perf/util/cpumap.h +5 -1
@@ -3,18 +3,19 @@#include <stdio.h> #include <stdbool.h> +#include <linux/atomic.h> #include "perf.h" #include "util/debug.h" struct cpu_map { +atomic_t refcnt;int nr;int map[]; };struct cpu_map *cpu_map__new (const char *cpu_list);struct cpu_map *cpu_map__dummy_new (void ); -void cpu_map__delete (struct cpu_map *map);struct cpu_map *cpu_map__read (FILE *file);size_t cpu_map__fprintf (struct cpu_map *map,FILE *fp);int cpu_map__get_socket (struct cpu_map *map,int idx);
@@ -22,6 +23,9 @@ int cpu_map__get_core(struct cpu_map *map, int idx);int cpu_map__build_socket_map (struct cpu_map *cpus,struct cpu_map **sockp);int cpu_map__build_core_map (struct cpu_map *cpus,struct cpu_map **corep); +struct cpu_map *cpu_map__get (struct cpu_map *map); +void cpu_map__put (struct cpu_map *map); +static inline int cpu_map__socket (struct cpu_map *sock,int s) {if (!sock || s > sock->nr || s <0 )
tools/perf/util/event.c +3 -3
@@ -504,7 +504,7 @@ int perf_event__synthesize_thread_map(struct perf_tool *tool,for (thread =0 ; thread < threads->nr; ++thread) {if (__event__synthesize_thread (comm_event, mmap_event, fork_event, - threads->map[thread],0 , +thread_map__pid (threads, thread),0 , process, tool, machine, mmap_data, proc_map_timeout)) { err =-1 ;
@@ -515,12 +515,12 @@ int perf_event__synthesize_thread_map(struct perf_tool *tool,* comm.pid is set to thread group id by * perf_event__synthesize_comm */ -if ((int ) comm_event->comm.pid != threads->map[thread]) { +if ((int ) comm_event->comm.pid !=thread_map__pid (threads, thread)) {bool need_leader = true;/* is thread group leader in thread_map? */ for (j =0 ; j < threads->nr; ++j) { -if ((int ) comm_event->comm.pid == threads->map[j]) { +if ((int ) comm_event->comm.pid ==thread_map__pid (threads, j)) { need_leader = false;break ; }
tools/perf/util/evlist.c +32 -7
@@ -114,8 +114,8 @@ void perf_evlist__delete(struct perf_evlist *evlist) {perf_evlist__munmap (evlist);perf_evlist__close (evlist); -cpu_map__delete (evlist->cpus); -thread_map__delete (evlist->threads); +cpu_map__put (evlist->cpus); +thread_map__put (evlist->threads); evlist->cpus =NULL ; evlist->threads =NULL ;perf_evlist__purge (evlist);
@@ -548,7 +548,7 @@ static void perf_evlist__set_sid_idx(struct perf_evlist *evlist,else sid->cpu =-1 ;if (!evsel->system_wide && evlist->threads && thread >=0 ) - sid->tid = evlist->threads->map[thread]; + sid->tid =thread_map__pid (evlist->threads, thread);else sid->tid =-1 ; }
@@ -1101,6 +1101,31 @@ int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages,return perf_evlist__mmap_ex (evlist, pages, overwrite,0 , false); } +static int perf_evlist__propagate_maps (struct perf_evlist *evlist, +struct target *target) +{ +struct perf_evsel *evsel; + +evlist__for_each (evlist, evsel) { +/* +* We already have cpus for evsel (via PMU sysfs) so +* keep it, if there's no target cpu list defined. +*/ +if (evsel->cpus && target->cpu_list) +cpu_map__put (evsel->cpus); + +if (!evsel->cpus || target->cpu_list) + evsel->cpus =cpu_map__get (evlist->cpus); + + evsel->threads =thread_map__get (evlist->threads); + +if (!evsel->cpus || !evsel->threads) +return -ENOMEM ; + } + +return 0 ; +} +int perf_evlist__create_maps (struct perf_evlist *evlist,struct target *target) { evlist->threads = thread_map__new_str(target->pid, target->tid,
@@ -1117,10 +1142,10 @@ int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target)if (evlist->cpus ==NULL ) goto out_delete_threads; -return 0 ; +return perf_evlist__propagate_maps (evlist, target); out_delete_threads: -thread_map__delete (evlist->threads); +thread_map__put (evlist->threads); evlist->threads =NULL ;return -1 ; }
@@ -1353,7 +1378,7 @@ static int perf_evlist__create_syswide_maps(struct perf_evlist *evlist) out:return err; out_free_cpus: -cpu_map__delete (evlist->cpus); +cpu_map__put (evlist->cpus); evlist->cpus =NULL ; goto out; }
@@ -1475,7 +1500,7 @@ int perf_evlist__prepare_workload(struct perf_evlist *evlist, struct target *tar __func__, __LINE__); goto out_close_pipes; } - evlist->threads->map[0 ] = evlist->workload.pid; +thread_map__set_pid (evlist->threads,0 , evlist->workload.pid); }close (child_ready_pipe[1 ]);
tools/perf/util/evlist.h +0 -1
@@ -289,5 +289,4 @@ void perf_evlist__to_front(struct perf_evlist *evlist,void perf_evlist__set_tracking_event (struct perf_evlist *evlist,struct perf_evsel *tracking_evsel); -#endif /* __PERF_EVLIST_H */
tools/perf/util/evsel.c +14 -14
@@ -885,6 +885,8 @@ void perf_evsel__exit(struct perf_evsel *evsel)perf_evsel__free_fd (evsel);perf_evsel__free_id (evsel);close_cgroup (evsel->cgrp); +cpu_map__put (evsel->cpus); +thread_map__put (evsel->threads);zfree (&evsel->group_name);zfree (&evsel->name); perf_evsel__object.fini (evsel);
@@ -896,7 +898,7 @@ void perf_evsel__delete(struct perf_evsel *evsel)free (evsel); } -void perf_evsel__compute_deltas (struct perf_evsel *evsel,int cpu, +void perf_evsel__compute_deltas (struct perf_evsel *evsel,int cpu,int thread,struct perf_counts_values *count) {struct perf_counts_values tmp;
@@ -908,8 +910,8 @@ void perf_evsel__compute_deltas(struct perf_evsel *evsel, int cpu, tmp = evsel->prev_raw_counts->aggr; evsel->prev_raw_counts->aggr = *count; }else { - tmp = evsel->prev_raw_counts->cpu[cpu]; - evsel->prev_raw_counts->cpu[cpu] = *count; + tmp = *perf_counts (evsel->prev_raw_counts, cpu, thread); + *perf_counts (evsel->prev_raw_counts, cpu, thread) = *count; } count->val = count->val - tmp.val;
@@ -937,20 +939,18 @@ void perf_counts_values__scale(struct perf_counts_values *count, *pscaled = scaled; } -int perf_evsel__read_cb (struct perf_evsel *evsel,int cpu,int thread, -perf_evsel__read_cb_t cb) +int perf_evsel__read (struct perf_evsel *evsel,int cpu,int thread, +struct perf_counts_values *count) { -struct perf_counts_values count; - -memset (&count,0 ,sizeof (count)); +memset (count,0 ,sizeof (*count));if (FD (evsel, cpu, thread) <0 )return -EINVAL ; -if (readn (FD (evsel, cpu, thread), &count,sizeof (count)) <0 ) +if (readn (FD (evsel, cpu, thread), count,sizeof (*count)) <0 )return -errno; -return cb (evsel, cpu, thread, &count); +return 0 ; } int __perf_evsel__read_on_cpu(struct perf_evsel *evsel,
@@ -962,15 +962,15 @@ int __perf_evsel__read_on_cpu(struct perf_evsel *evsel,if (FD (evsel, cpu, thread) <0 )return -EINVAL ; -if (evsel->counts ==NULL &&perf_evsel__alloc_counts (evsel, cpu +1 ) <0 ) +if (evsel->counts ==NULL &&perf_evsel__alloc_counts (evsel, cpu +1 , thread +1 ) <0 )return -ENOMEM ;if (readn (FD (evsel, cpu, thread), &count, nv *sizeof (u64)) <0 )return -errno; -perf_evsel__compute_deltas (evsel, cpu, &count); +perf_evsel__compute_deltas (evsel, cpu, thread, &count);perf_counts_values__scale (&count, scale,NULL ); - evsel->counts->cpu[cpu] = count; + *perf_counts (evsel->counts, cpu, thread) = count;return 0 ; }
@@ -1167,7 +1167,7 @@ static int __perf_evsel__open(struct perf_evsel *evsel, struct cpu_map *cpus,int group_fd;if (!evsel->cgrp && !evsel->system_wide) - pid = threads->map[thread]; + pid =thread_map__pid (threads, thread); group_fd =get_group_fd (evsel, cpu, thread); retry_open:
tools/perf/util/evsel.h +16 -24
@@ -8,23 +8,8 @@#include <linux/types.h> #include "xyarray.h" #include "symbol.h" - -struct perf_counts_values { -union { -struct { -u64 val; -u64 ena; -u64 run; - }; -u64 values[3 ]; - }; -}; - -struct perf_counts { -s8 scaled; -struct perf_counts_values aggr; -struct perf_counts_values cpu[]; -}; +#include "cpumap.h" +#include "stat.h" struct perf_evsel ;
@@ -82,6 +67,7 @@ struct perf_evsel {struct cgroup_sel *cgrp;void *handler;struct cpu_map *cpus; +struct thread_map *threads;unsigned int sample_size;int id_pos;int is_pos;
@@ -113,10 +99,20 @@ struct thread_map;struct perf_evlist ;struct record_opts ; +static inline struct cpu_map *perf_evsel__cpus (struct perf_evsel *evsel) +{ +return evsel->cpus; +} + +static inline int perf_evsel__nr_cpus (struct perf_evsel *evsel) +{ +return perf_evsel__cpus (evsel)->nr; +} +void perf_counts_values__scale (struct perf_counts_values *count,bool scale,s8 *pscaled); -void perf_evsel__compute_deltas (struct perf_evsel *evsel,int cpu, +void perf_evsel__compute_deltas (struct perf_evsel *evsel,int cpu,int thread,struct perf_counts_values *count); int perf_evsel__object_config(size_t object_size,
@@ -233,12 +229,8 @@ static inline bool perf_evsel__match2(struct perf_evsel *e1, (a)->attr.type == (b)->attr.type && \ (a)->attr.config == (b)->attr.config) -typedef int (perf_evsel__read_cb_t )(struct perf_evsel *evsel, -int cpu,int thread, -struct perf_counts_values *count); - -int perf_evsel__read_cb (struct perf_evsel *evsel,int cpu,int thread, -perf_evsel__read_cb_t cb); +int perf_evsel__read (struct perf_evsel *evsel,int cpu,int thread, +struct perf_counts_values *count);int __perf_evsel__read_on_cpu (struct perf_evsel *evsel,int cpu,int thread,bool scale);
tools/perf/util/header.c +1 -2
@@ -1063,8 +1063,7 @@ read_event_desc(struct perf_header *ph, int fd)free (buf);return events; error: -if (events) -free_event_desc (events); +free_event_desc (events); events =NULL ; goto out; }
tools/perf/util/machine.c +1 -2
@@ -1448,10 +1448,9 @@ int machine__process_event(struct machine *machine, union perf_event *event,case PERF_RECORD_AUX : ret =machine__process_aux_event (machine, event);break ;case PERF_RECORD_ITRACE_START : - ret =machine__process_itrace_start_event (machine, event); + ret =machine__process_itrace_start_event (machine, event);break ;case PERF_RECORD_LOST_SAMPLES : ret =machine__process_lost_samples_event (machine, event, sample);break ; -break ;default : ret =-1 ;break ;
tools/perf/util/parse-events.c +4 -1
@@ -17,6 +17,7 @@#include "parse-events-flex.h" #include "pmu.h" #include "thread_map.h" +#include "cpumap.h" #include "asm/bug.h" #define MAX_NAME_LEN 100
@@ -285,7 +286,9 @@ __add_event(struct list_head *list, int *idx,if (!evsel)return NULL ; - evsel->cpus = cpus; +if (cpus) + evsel->cpus =cpu_map__get (cpus); +if (name) evsel->name =strdup (name);list_add_tail (&evsel->node, list);
tools/perf/util/parse-events.l +2 -3
@@ -119,8 +119,8 @@ event [^,{}/]+ num_dec [0-9]+ num_hex 0x[a-fA-F0-9]+ num_raw_hex [a-fA-F0-9]+ -name [a-zA-Z_*?][a-zA-Z0-9_*?]* -name_minus [a-zA-Z_*?][a-zA-Z0-9\-_*?]* +name [a-zA-Z_*?][a-zA-Z0-9_*?.]* +name_minus [a-zA-Z_*?][a-zA-Z0-9\-_*?.]* /* If you add a modifier you need to update check_modifier() */ modifier_event [ukhpGHSDI]+ modifier_bp [rwx]{1,3}
@@ -165,7 +165,6 @@ modifier_bp [rwx]{1,3} return PE_EVENT_NAME; } -. | <<EOF>> { BEGIN(INITIAL); REWIND(0);
tools/perf/util/pmu.c +29 -16
83 lines not on this page · raw message
tools/perf/util/probe-event.c +5 -1
@@ -249,8 +249,12 @@ static void clear_probe_trace_events(struct probe_trace_event *tevs, int ntevs)static bool kprobe_blacklist__listed (unsigned long address);static bool kprobe_warn_out_range (const char *symbol,unsigned long address) { +u64 etext_addr; +/* Get the address of _etext for checking non-probable text symbol */ -if (kernel_get_symbol_address_by_name ("_etext" , false) < address) + etext_addr =kernel_get_symbol_address_by_name ("_etext" , false); + +if (etext_addr !=0 && etext_addr < address)pr_warning ("%s is out of .text, skip it.\n" , symbol);else if (kprobe_blacklist__listed (address))pr_warning ("%s is blacklisted function, skip it.\n" , symbol);
tools/perf/util/python-ext-sources +1 -0
@@ -20,3 +20,4 @@ util/stat.c util/strlist.c util/trace-event.c ../../lib/rbtree.c +util/string.c
tools/perf/util/python.c +2 -2
@@ -384,7 +384,7 @@ static int pyrf_cpu_map__init(struct pyrf_cpu_map *pcpus,static void pyrf_cpu_map__delete (struct pyrf_cpu_map *pcpus) { -cpu_map__delete (pcpus->cpus); +cpu_map__put (pcpus->cpus); pcpus->ob_type->tp_free ((PyObject *)pcpus); }
@@ -453,7 +453,7 @@ static int pyrf_thread_map__init(struct pyrf_thread_map *pthreads,static void pyrf_thread_map__delete (struct pyrf_thread_map *pthreads) { -thread_map__delete (pthreads->threads); +thread_map__put (pthreads->threads); pthreads->ob_type->tp_free ((PyObject *)pthreads); }
tools/perf/util/record.c +2 -2
@@ -64,7 +64,7 @@ static bool perf_probe_api(setup_probe_fn_t fn)if (!cpus)return false; cpu = cpus->map[0 ]; -cpu_map__delete (cpus); +cpu_map__put (cpus); do { ret = perf_do_probe_api(fn, cpu, try[i++]);
@@ -226,7 +226,7 @@ bool perf_evlist__can_select_event(struct perf_evlist *evlist, const char *str)struct cpu_map *cpus =cpu_map__new (NULL ); cpu = cpus ? cpus->map[0 ] :0 ; -cpu_map__delete (cpus); +cpu_map__put (cpus); }else { cpu = evlist->cpus->map[0 ]; }
tools/perf/util/session.c +4 -2
@@ -686,6 +686,8 @@ static int process_finished_round(struct perf_tool *tool __maybe_unused, union perf_event *event __maybe_unused, struct ordered_events *oe) { + if (dump_trace) + fprintf(stdout, "\n"); return ordered_events__flush(oe, OE_FLUSH__ROUND); }
@@ -1726,7 +1728,7 @@ size_t perf_session__fprintf_nr_events(struct perf_session *session, FILE *fp)if (perf_header__has_feat (&session->header,HEADER_AUXTRACE )) msg =" (excludes AUX area (e.g. instruction trace) decoded / synthesized events)" ; - ret =fprintf (fp,"Aggregated stats:%s\n" , msg); + ret =fprintf (fp,"\nAggregated stats:%s\n" , msg); ret +=events_stats__fprintf (&session->evlist->stats, fp);return ret;
@@ -1893,7 +1895,7 @@ int perf_session__cpu_bitmap(struct perf_session *session, err =0 ; out_delete_map: -cpu_map__delete (map); +cpu_map__put (map);return err; }
tools/perf/util/stat.c +120 -12
162 lines not on this page · raw message
tools/perf/util/stat.h +44 -3
74 lines not on this page · raw message
tools/perf/util/svghelper.c +1 -1
@@ -748,7 +748,7 @@ static int str_to_bitmap(char *s, cpumask_t *b)set_bit (c,cpumask_bits (b)); } -cpu_map__delete (m); +cpu_map__put (m);return ret; }
tools/perf/util/symbol.c +4 -1
@@ -1132,8 +1132,11 @@ static int dso__load_kcore(struct dso *dso, struct map *map,INIT_LIST_HEAD (&md.maps); fd =open (kcore_filename,O_RDONLY ); -if (fd <0 ) +if (fd <0 ) { +pr_err ("%s requires CAP_SYS_RAWIO capability to access.\n" , + kcore_filename);return -EINVAL ; + }/* Read new maps into temporary lists */ err = file__read_maps(fd, md.type == MAP__FUNCTION, kcore_mapfn, &md,
tools/perf/util/thread_map.c +117 -15
213 lines not on this page · raw message
tools/perf/util/thread_map.h +28 -3
@@ -3,10 +3,17 @@#include <sys/types.h> #include <stdio.h> +#include <linux/atomic.h> + +struct thread_map_data { +pid_t pid; +char *comm; +};struct thread_map { +atomic_t refcnt;int nr; -pid_t map[]; +struct thread_map_data map[]; };struct thread_map *thread_map__new_dummy (void );
@@ -15,11 +22,12 @@ struct thread_map *thread_map__new_by_tid(pid_t tid);struct thread_map *thread_map__new_by_uid (uid_t uid);struct thread_map *thread_map__new (pid_t pid,pid_t tid,uid_t uid); +struct thread_map *thread_map__get (struct thread_map *map); +void thread_map__put (struct thread_map *map); +struct thread_map *thread_map__new_str (const char *pid,const char *tid,uid_t uid); -void thread_map__delete (struct thread_map *threads); -size_t thread_map__fprintf (struct thread_map *threads,FILE *fp);static inline int thread_map__nr (struct thread_map *threads)
@@ -27,4 +35,21 @@ static inline int thread_map__nr(struct thread_map *threads) return threads ? threads->nr : 1; } +static inline pid_t thread_map__pid (struct thread_map *map,int thread) +{ +return map->map[thread].pid; +} + +static inline void +thread_map__set_pid (struct thread_map *map,int thread,pid_t pid) +{ + map->map[thread].pid = pid; +} + +static inline char *thread_map__comm (struct thread_map *map,int thread) +{ +return map->map[thread].comm; +} + +void thread_map__read_comms (struct thread_map *threads);#endif /* __PERF_THREAD_MAP_H */