Pull perf updates from Ingo Molnar:
"The tooling changes maintained by Jiri Olsa until Arnaldo is on
vacation:
User visible changes:
- Add -F option for specifying output fields (Namhyung Kim)
- Propagate exit status of a command line workload for record command
(Namhyung Kim)
- Use tid for finding thread (Namhyung Kim)
- Clarify the output of perf sched map plus small sched command
fixes (Dongsheng Yang)
- Wire up perf_regs and unwind support for ARM64 (Jean Pihet)
- Factor hists statistics counts processing which in turn also fixes
several bugs in TUI report command (Namhyung Kim)
- Add --percentage option to control absolute/relative percentage
output (Namhyung Kim)
- Add --list-cmds to 'kmem', 'mem', 'lock' and 'sched', for use by
completion scripts (Ramkumar Ramachandra)
Development/infrastructure changes and fixes:
- Android related fixes for pager and map dso resolving (Michael
Lentine)
- Add libdw DWARF post unwind support for ARM (Jean Pihet)
- Consolidate types.h for ARM and ARM64 (Jean Pihet)
- Fix possible null pointer dereference in session.c (Masanari Iida)
- Cleanup, remove unused variables in map_switch_event() (Dongsheng
Yang)
- Remove nr_state_machine_bugs in perf latency (Dongsheng Yang)
- Remove usage of trace_sched_wakeup(.success) (Peter Zijlstra)
- Cleanups for perf.h header (Jiri Olsa)
- Consolidate types.h and export.h within tools (Borislav Petkov)
- Move u64_swap union to its single user's header, evsel.h (Borislav
Petkov)
- Fix for s390 to properly parse tracepoints plus test code
(Alexander Yarygin)
- Handle EINTR error for readn/writen (Namhyung Kim)
- Add a test case for hists filtering (Namhyung Kim)
- Share map_groups among threads of the same group (Arnaldo Carvalho
de Melo, Jiri Olsa)
- Making some code (cpu node map and report parse callchain callback)
global to be usable by upcomming changes (Don Zickus)
- Fix pmu object compilation error (Jiri Olsa)
Kernel side changes:
- intrusive uprobes fixes from Oleg Nesterov. Since the interface is
admin-only, and the bug only affects user-space ("any probed
jmp/call can kill the application"), we queued these fixes via the
development tree, as a special exception.
- more fuzzer motivated race fixes and related refactoring and
robustization.
- allow PMU drivers to be built as modules. (No actual module yet,
because the x86 Intel uncore module wasn't ready in time for this)"
* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (114 commits)
perf tools: Add automatic remapping of Android libraries
perf tools: Add cat as fallback pager
perf tests: Add a testcase for histogram output sorting
perf tests: Factor out print_hists_*()
perf tools: Introduce reset_output_field()
perf tools: Get rid of obsolete hist_entry__sort_list
perf hists: Reset width of output fields with header length
perf tools: Skip elided sort entries
perf top: Add --fields option to specify output fields
perf report/tui: Fix a bug when --fields/sort is given
perf tools: Add ->sort() member to struct sort_entry
perf report: Add -F option to specify output fields
perf tools: Call perf_hpp__init() before setting up GUI browsers
perf tools: Consolidate management of default sort orders
perf tools: Allow hpp fields to be sort keys
perf ui: Get rid of callback from __hpp__fmt()
perf tools: Consolidate output field handling to hpp format routines
perf tools: Use hpp formats to sort final output
perf tools: Support event grouping in hpp ->sort()
perf tools: Use hpp formats to sort hist entries
...
243 lines
5.8 KiB
Makefile
243 lines
5.8 KiB
Makefile
# file format version
|
|
FILE_VERSION = 1
|
|
|
|
LIBLOCKDEP_VERSION=$(shell make --no-print-directory -sC ../../.. kernelversion)
|
|
|
|
# Makefiles suck: This macro sets a default value of $(2) for the
|
|
# variable named by $(1), unless the variable has been set by
|
|
# environment or command line. This is necessary for CC and AR
|
|
# because make sets default values, so the simpler ?= approach
|
|
# won't work as expected.
|
|
define allow-override
|
|
$(if $(or $(findstring environment,$(origin $(1))),\
|
|
$(findstring command line,$(origin $(1)))),,\
|
|
$(eval $(1) = $(2)))
|
|
endef
|
|
|
|
# Allow setting CC and AR, or setting CROSS_COMPILE as a prefix.
|
|
$(call allow-override,CC,$(CROSS_COMPILE)gcc)
|
|
$(call allow-override,AR,$(CROSS_COMPILE)ar)
|
|
|
|
INSTALL = install
|
|
|
|
# Use DESTDIR for installing into a different root directory.
|
|
# This is useful for building a package. The program will be
|
|
# installed in this directory as if it was the root directory.
|
|
# Then the build tool can move it later.
|
|
DESTDIR ?=
|
|
DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))'
|
|
|
|
prefix ?= /usr/local
|
|
libdir_relative = lib
|
|
libdir = $(prefix)/$(libdir_relative)
|
|
bindir_relative = bin
|
|
bindir = $(prefix)/$(bindir_relative)
|
|
|
|
export DESTDIR DESTDIR_SQ INSTALL
|
|
|
|
# copy a bit from Linux kbuild
|
|
|
|
ifeq ("$(origin V)", "command line")
|
|
VERBOSE = $(V)
|
|
endif
|
|
ifndef VERBOSE
|
|
VERBOSE = 0
|
|
endif
|
|
|
|
ifeq ("$(origin O)", "command line")
|
|
BUILD_OUTPUT := $(O)
|
|
endif
|
|
|
|
ifeq ($(BUILD_SRC),)
|
|
ifneq ($(BUILD_OUTPUT),)
|
|
|
|
define build_output
|
|
$(if $(VERBOSE:1=),@)$(MAKE) -C $(BUILD_OUTPUT) \
|
|
BUILD_SRC=$(CURDIR) -f $(CURDIR)/Makefile $1
|
|
endef
|
|
|
|
saved-output := $(BUILD_OUTPUT)
|
|
BUILD_OUTPUT := $(shell cd $(BUILD_OUTPUT) && /bin/pwd)
|
|
$(if $(BUILD_OUTPUT),, \
|
|
$(error output directory "$(saved-output)" does not exist))
|
|
|
|
all: sub-make
|
|
|
|
gui: force
|
|
$(call build_output, all_cmd)
|
|
|
|
$(filter-out gui,$(MAKECMDGOALS)): sub-make
|
|
|
|
sub-make: force
|
|
$(call build_output, $(MAKECMDGOALS))
|
|
|
|
|
|
# Leave processing to above invocation of make
|
|
skip-makefile := 1
|
|
|
|
endif # BUILD_OUTPUT
|
|
endif # BUILD_SRC
|
|
|
|
# We process the rest of the Makefile if this is the final invocation of make
|
|
ifeq ($(skip-makefile),)
|
|
|
|
srctree := $(realpath $(if $(BUILD_SRC),$(BUILD_SRC),$(CURDIR)))
|
|
objtree := $(realpath $(CURDIR))
|
|
src := $(srctree)
|
|
obj := $(objtree)
|
|
|
|
export prefix libdir bindir src obj
|
|
|
|
# Shell quotes
|
|
libdir_SQ = $(subst ','\'',$(libdir))
|
|
bindir_SQ = $(subst ','\'',$(bindir))
|
|
|
|
LIB_FILE = liblockdep.a liblockdep.so.$(LIBLOCKDEP_VERSION)
|
|
BIN_FILE = lockdep
|
|
|
|
CONFIG_INCLUDES =
|
|
CONFIG_LIBS =
|
|
CONFIG_FLAGS =
|
|
|
|
OBJ = $@
|
|
N =
|
|
|
|
export Q VERBOSE
|
|
|
|
INCLUDES = -I. -I/usr/local/include -I./uinclude -I./include -I../../include $(CONFIG_INCLUDES)
|
|
|
|
# Set compile option CFLAGS if not set elsewhere
|
|
CFLAGS ?= -g -DCONFIG_LOCKDEP -DCONFIG_STACKTRACE -DCONFIG_PROVE_LOCKING -DBITS_PER_LONG=__WORDSIZE -DLIBLOCKDEP_VERSION='"$(LIBLOCKDEP_VERSION)"' -rdynamic -O0 -g
|
|
|
|
override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ)
|
|
|
|
ifeq ($(VERBOSE),1)
|
|
Q =
|
|
print_compile =
|
|
print_app_build =
|
|
print_fpic_compile =
|
|
print_shared_lib_compile =
|
|
print_install =
|
|
else
|
|
Q = @
|
|
print_compile = echo ' CC '$(OBJ);
|
|
print_app_build = echo ' BUILD '$(OBJ);
|
|
print_fpic_compile = echo ' CC FPIC '$(OBJ);
|
|
print_shared_lib_compile = echo ' BUILD SHARED LIB '$(OBJ);
|
|
print_static_lib_build = echo ' BUILD STATIC LIB '$(OBJ);
|
|
print_install = echo ' INSTALL '$1' to $(DESTDIR_SQ)$2';
|
|
endif
|
|
|
|
do_fpic_compile = \
|
|
($(print_fpic_compile) \
|
|
$(CC) -c $(CFLAGS) $(EXT) -fPIC $< -o $@)
|
|
|
|
do_app_build = \
|
|
($(print_app_build) \
|
|
$(CC) $^ -rdynamic -o $@ $(CONFIG_LIBS) $(LIBS))
|
|
|
|
do_compile_shared_library = \
|
|
($(print_shared_lib_compile) \
|
|
$(CC) --shared $^ -o $@ -lpthread -ldl -Wl,-soname='"$@"';$(shell ln -s $@ liblockdep.so))
|
|
|
|
do_build_static_lib = \
|
|
($(print_static_lib_build) \
|
|
$(RM) $@; $(AR) rcs $@ $^)
|
|
|
|
|
|
define do_compile
|
|
$(print_compile) \
|
|
$(CC) -c $(CFLAGS) $(EXT) $< -o $(obj)/$@;
|
|
endef
|
|
|
|
$(obj)/%.o: $(src)/%.c
|
|
$(Q)$(call do_compile)
|
|
|
|
%.o: $(src)/%.c
|
|
$(Q)$(call do_compile)
|
|
|
|
PEVENT_LIB_OBJS = common.o lockdep.o preload.o rbtree.o
|
|
|
|
ALL_OBJS = $(PEVENT_LIB_OBJS)
|
|
|
|
CMD_TARGETS = $(LIB_FILE)
|
|
|
|
TARGETS = $(CMD_TARGETS)
|
|
|
|
|
|
all: all_cmd
|
|
|
|
all_cmd: $(CMD_TARGETS)
|
|
|
|
liblockdep.so.$(LIBLOCKDEP_VERSION): $(PEVENT_LIB_OBJS)
|
|
$(Q)$(do_compile_shared_library)
|
|
|
|
liblockdep.a: $(PEVENT_LIB_OBJS)
|
|
$(Q)$(do_build_static_lib)
|
|
|
|
$(PEVENT_LIB_OBJS): %.o: $(src)/%.c
|
|
$(Q)$(do_fpic_compile)
|
|
|
|
## make deps
|
|
|
|
all_objs := $(sort $(ALL_OBJS))
|
|
all_deps := $(all_objs:%.o=.%.d)
|
|
|
|
# let .d file also depends on the source and header files
|
|
define check_deps
|
|
@set -e; $(RM) $@; \
|
|
$(CC) -MM $(CFLAGS) $< > $@.$$$$; \
|
|
sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
|
|
$(RM) $@.$$$$
|
|
endef
|
|
|
|
$(all_deps): .%.d: $(src)/%.c
|
|
$(Q)$(call check_deps)
|
|
|
|
$(all_objs) : %.o : .%.d
|
|
|
|
dep_includes := $(wildcard $(all_deps))
|
|
|
|
ifneq ($(dep_includes),)
|
|
include $(dep_includes)
|
|
endif
|
|
|
|
### Detect environment changes
|
|
TRACK_CFLAGS = $(subst ','\'',$(CFLAGS)):$(ARCH):$(CROSS_COMPILE)
|
|
|
|
tags: force
|
|
$(RM) tags
|
|
find . -name '*.[ch]' | xargs ctags --extra=+f --c-kinds=+px \
|
|
--regex-c++='/_PE\(([^,)]*).*/PEVENT_ERRNO__\1/'
|
|
|
|
TAGS: force
|
|
$(RM) TAGS
|
|
find . -name '*.[ch]' | xargs etags \
|
|
--regex='/_PE(\([^,)]*\).*/PEVENT_ERRNO__\1/'
|
|
|
|
define do_install
|
|
$(print_install) \
|
|
if [ ! -d '$(DESTDIR_SQ)$2' ]; then \
|
|
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2'; \
|
|
fi; \
|
|
$(INSTALL) $1 '$(DESTDIR_SQ)$2'
|
|
endef
|
|
|
|
install_lib: all_cmd
|
|
$(Q)$(call do_install,$(LIB_FILE),$(libdir_SQ))
|
|
$(Q)$(call do_install,$(BIN_FILE),$(bindir_SQ))
|
|
|
|
install: install_lib
|
|
|
|
clean:
|
|
$(RM) *.o *~ $(TARGETS) *.a *liblockdep*.so* $(VERSION_FILES) .*.d
|
|
$(RM) tags TAGS
|
|
|
|
endif # skip-makefile
|
|
|
|
PHONY += force
|
|
force:
|
|
|
|
# Declare the contents of the .PHONY variable as phony. We keep that
|
|
# information in a variable so we can use it in if_changed and friends.
|
|
.PHONY: $(PHONY)
|