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

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

User visible changes:

  - Fix "Command" sort_entry's cmp and collapse function (Jiri Olsa)

  - Load map's symtab before 'perf probe' glob matching (Wang Nan)

  - Set vmlinux_path__nr_entries to 0 in vmlinux_path__exit, to fix
    the use case where this code is called multiple times, which wasn't
    that common when it was introduced but seems to be now (Wang Nan).

Infrastructure changes:

  - Protect dso symtab and cache operations with a mutex (Namhyung Kim)

  - Make all refcnt operations use atomic.h (Arnaldo Carvalho de Melo)

  - Install libtraceevent.a into libdir (Wang Nan)

Build fixes:

  - Fix one build failure on RHEL5 by making 'perf bench numa' use the
    __weak sched_getcpu() provided by cloexec.h (Arnaldo Carvalho de Melo)

  - Fix dwarf-aux.c compilation on i386 (Jiri Olsa)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents aa891009 2d8e405a

tools/build/Makefile.feature

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ endef 
#   the rule that uses them - an example for that is the 'bionic'

#   feature check. ]

#

FEATURE_TESTS =			\

FEATURE_TESTS ?=			\

	backtrace			\

	dwarf				\

	fortify-source			\
@@ -53,7 +53,7 @@ FEATURE_TESTS = \ 
	zlib				\

	lzma



FEATURE_DISPLAY =			\

FEATURE_DISPLAY ?=			\

	dwarf				\

	glibc				\

	gtk2				\

tools/include/linux/types.h

+4 −0
Original line number Diff line number Diff line
@@ -64,6 +64,10 @@ typedef struct { 
	int counter;

} atomic_t;



#ifndef __aligned_u64

# define __aligned_u64 __u64 __attribute__((aligned(8)))

#endif



struct list_head {

	struct list_head *next, *prev;

};

tools/lib/traceevent/Makefile

+13 −7
Original line number Diff line number Diff line
@@ -34,9 +34,15 @@ INSTALL = install 
DESTDIR ?=

DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))'



LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1)

ifeq ($(LP64), 1)

  libdir_relative = lib64

else

  libdir_relative = lib

endif



prefix ?= /usr/local

bindir_relative = bin

bindir = $(prefix)/$(bindir_relative)

libdir = $(prefix)/$(libdir_relative)

man_dir = $(prefix)/share/man

man_dir_SQ = '$(subst ','\'',$(man_dir))'
@@ -58,7 +64,7 @@ ifeq ($(prefix),$(HOME)) 
override plugin_dir = $(HOME)/.traceevent/plugins

set_plugin_dir := 0

else

override plugin_dir = $(prefix)/lib/traceevent/plugins

override plugin_dir = $(libdir)/traceevent/plugins

endif

endif
@@ -85,11 +91,11 @@ srctree := $(patsubst %/,%,$(dir $(srctree))) 
#$(info Determined 'srctree' to be $(srctree))

endif



export prefix bindir src obj

export prefix libdir src obj



# Shell quotes

bindir_SQ = $(subst ','\'',$(bindir))

bindir_relative_SQ = $(subst ','\'',$(bindir_relative))

libdir_SQ = $(subst ','\'',$(libdir))

libdir_relative_SQ = $(subst ','\'',$(libdir_relative))

plugin_dir_SQ = $(subst ','\'',$(plugin_dir))



LIB_FILE = libtraceevent.a libtraceevent.so
@@ -240,7 +246,7 @@ endef 


install_lib: all_cmd install_plugins

	$(call QUIET_INSTALL, $(LIB_FILE)) \

		$(call do_install,$(LIB_FILE),$(bindir_SQ))

		$(call do_install,$(LIB_FILE),$(libdir_SQ))



install_plugins: $(PLUGINS)

	$(call QUIET_INSTALL, trace_plugins) \

tools/perf/bench/numa.c

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include "../builtin.h"

#include "../util/util.h"

#include "../util/parse-options.h"

#include "../util/cloexec.h"



#include "bench.h"

tools/perf/builtin-timechart.c

+2 −2
Original line number Diff line number Diff line
@@ -61,13 +61,13 @@ struct timechart { 
				tasks_only,

				with_backtrace,

				topology;

	bool			force;

	/* IO related settings */

	u64			io_events;

	bool			io_only,

				skip_eagain;

	u64			io_events;

	u64			min_time,

				merge_dist;

	bool			force;

};



struct per_pidcomm;

CRA Git | Maintained and supported by SUSTech CRA and CCSE