Merge tag 'perf-core-for-mingo' of... (7104f194) · Commits · 戴 / test

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: - Make 'perf record' collect CPU cache info in the perf.data file header: $ perf record usleep 1 [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.017 MB perf.data (7 samples) ] $ perf report --header-only -I | tail -10 | head -8 # CPU cache info: # L1 Data 32K [0-1] # L1 Instruction 32K [0-1] # L1 Data 32K [2-3] # L1 Instruction 32K [2-3] # L2 Unified 256K [0-1] # L2 Unified 256K [2-3] # L3 Unified 4096K [0-3] $ Will be used in 'perf c2c' and eventually in 'perf diff' to allow, for instance running the same workload in multiple machines and then when using 'diff' show the hardware difference. (Jiri Olsa) - 'perf stat' now shows shadow metrics (insn per cycle, etc) in interval mode too. E.g: # perf stat -I 1000 -e instructions,cycles sleep 1 # time counts unit events 1.000215928 519,620 instructions # 0.69 insn per cycle 1.000215928 752,003 cycles <SNIP> Infrastructure changes: - libapi now can also use pr_{warning,info,debug}() and that can be set by tools using it (Jiri Olsa) - libapi adopts filename__read_str() from perf, adds sysfs__read_str() (Jiri Olsa) - Add check for java alternatives cmd in jvmti Makefile, so that it manages to automatically find the right path for the JDK devel files in Ubuntu like systems in addition to Fedora like ones (Stephane Eranian) Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by:

Ingo Molnar <mingo@kernel.org>

tools/lib/api/Build

+1 −0

Original line number	Diff line number	Diff line
		libapi-y += fd/
		libapi-y += fs/
		libapi-y += cpu.o
		libapi-y += debug.o

tools/lib/api/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ LIBFILE = $(OUTPUT)libapi.a
		CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
		CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC
		CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
		CFLAGS += -I$(srctree)/tools/lib/api

		RM = rm -f

tools/lib/api/debug-internal.h

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		#ifndef __API_DEBUG_INTERNAL_H__
		#define __API_DEBUG_INTERNAL_H__

		#include "debug.h"

		#define __pr(func, fmt, ...) \
		do { \
		if ((func)) \
		(func)("libapi: " fmt, ##__VA_ARGS__); \
		} while (0)

		extern libapi_print_fn_t __pr_warning;
		extern libapi_print_fn_t __pr_info;
		extern libapi_print_fn_t __pr_debug;

		#define pr_warning(fmt, ...) __pr(__pr_warning, fmt, ##__VA_ARGS__)
		#define pr_info(fmt, ...) __pr(__pr_info, fmt, ##__VA_ARGS__)
		#define pr_debug(fmt, ...) __pr(__pr_debug, fmt, ##__VA_ARGS__)

		#endif /* __API_DEBUG_INTERNAL_H__ */

tools/lib/api/debug.c

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		#include <stdio.h>
		#include <stdarg.h>
		#include "debug.h"
		#include "debug-internal.h"

		static int __base_pr(const char *format, ...)
		{
		va_list args;
		int err;

		va_start(args, format);
		err = vfprintf(stderr, format, args);
		va_end(args);
		return err;
		}

		libapi_print_fn_t __pr_warning = __base_pr;
		libapi_print_fn_t __pr_info = __base_pr;
		libapi_print_fn_t __pr_debug;

		void libapi_set_print(libapi_print_fn_t warn,
		libapi_print_fn_t info,
		libapi_print_fn_t debug)
		{
		__pr_warning = warn;
		__pr_info = info;
		__pr_debug = debug;
		}

tools/lib/api/debug.h

0 → 100644

+10 −0

Original line number	Diff line number	Diff line
		#ifndef __API_DEBUG_H__
		#define __API_DEBUG_H__

		typedef int (libapi_print_fn_t)(const char , ...);

		void libapi_set_print(libapi_print_fn_t warn,
		libapi_print_fn_t info,
		libapi_print_fn_t debug);

		#endif /* __API_DEBUG_H__ */

Admin message