Commit 2205afa7 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'perf-fixes-for-linus' of...

Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf sched: Fix build failure on sparc
  perf bench: Add "all" pseudo subsystem and "all" pseudo suite
  perf tools: Introduce perf_session class
  perf symbols: Ditch dso->find_symbol
  perf symbols: Allow lookups by symbol name too
  perf symbols: Add missing "Variables" entry to map_type__name
  perf symbols: Add support for 'variable' symtabs
  perf symbols: Introduce ELF counterparts to symbol_type__is_a
  perf symbols: Introduce symbol_type__is_a
  perf symbols: Rename kthreads to kmaps, using another abstraction for it
  perf tools: Allow building for ARM
  hw-breakpoints: Handle bad modify_user_hw_breakpoint off-case return value
  perf tools: Allow cross compiling
  tracing, slab: Fix no callsite ifndef CONFIG_KMEMTRACE
  tracing, slab: Define kmem_cache_alloc_notrace ifdef CONFIG_TRACING

Trivial conflict due to different fixes to modify_user_hw_breakpoint()
in include/linux/hw_breakpoint.h
parents 491424c0 2cd9046c
...@@ -93,7 +93,7 @@ register_user_hw_breakpoint(struct perf_event_attr *attr, ...@@ -93,7 +93,7 @@ register_user_hw_breakpoint(struct perf_event_attr *attr,
struct task_struct *tsk) { return NULL; } struct task_struct *tsk) { return NULL; }
static inline int static inline int
modify_user_hw_breakpoint(struct perf_event *bp, modify_user_hw_breakpoint(struct perf_event *bp,
struct perf_event_attr *attr) { return 0; } struct perf_event_attr *attr) { return -ENOSYS; }
static inline struct perf_event * static inline struct perf_event *
register_wide_hw_breakpoint_cpu(struct perf_event_attr *attr, register_wide_hw_breakpoint_cpu(struct perf_event_attr *attr,
perf_overflow_handler_t triggered, perf_overflow_handler_t triggered,
......
...@@ -110,7 +110,7 @@ extern struct cache_sizes malloc_sizes[]; ...@@ -110,7 +110,7 @@ extern struct cache_sizes malloc_sizes[];
void *kmem_cache_alloc(struct kmem_cache *, gfp_t); void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
void *__kmalloc(size_t size, gfp_t flags); void *__kmalloc(size_t size, gfp_t flags);
#ifdef CONFIG_KMEMTRACE #ifdef CONFIG_TRACING
extern void *kmem_cache_alloc_notrace(struct kmem_cache *cachep, gfp_t flags); extern void *kmem_cache_alloc_notrace(struct kmem_cache *cachep, gfp_t flags);
extern size_t slab_buffer_size(struct kmem_cache *cachep); extern size_t slab_buffer_size(struct kmem_cache *cachep);
#else #else
...@@ -166,7 +166,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags) ...@@ -166,7 +166,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
extern void *__kmalloc_node(size_t size, gfp_t flags, int node); extern void *__kmalloc_node(size_t size, gfp_t flags, int node);
extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node); extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
#ifdef CONFIG_KMEMTRACE #ifdef CONFIG_TRACING
extern void *kmem_cache_alloc_node_notrace(struct kmem_cache *cachep, extern void *kmem_cache_alloc_node_notrace(struct kmem_cache *cachep,
gfp_t flags, gfp_t flags,
int nodeid); int nodeid);
......
...@@ -217,7 +217,7 @@ static __always_inline struct kmem_cache *kmalloc_slab(size_t size) ...@@ -217,7 +217,7 @@ static __always_inline struct kmem_cache *kmalloc_slab(size_t size)
void *kmem_cache_alloc(struct kmem_cache *, gfp_t); void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
void *__kmalloc(size_t size, gfp_t flags); void *__kmalloc(size_t size, gfp_t flags);
#ifdef CONFIG_KMEMTRACE #ifdef CONFIG_TRACING
extern void *kmem_cache_alloc_notrace(struct kmem_cache *s, gfp_t gfpflags); extern void *kmem_cache_alloc_notrace(struct kmem_cache *s, gfp_t gfpflags);
#else #else
static __always_inline void * static __always_inline void *
...@@ -266,7 +266,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags) ...@@ -266,7 +266,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
void *__kmalloc_node(size_t size, gfp_t flags, int node); void *__kmalloc_node(size_t size, gfp_t flags, int node);
void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node); void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
#ifdef CONFIG_KMEMTRACE #ifdef CONFIG_TRACING
extern void *kmem_cache_alloc_node_notrace(struct kmem_cache *s, extern void *kmem_cache_alloc_node_notrace(struct kmem_cache *s,
gfp_t gfpflags, gfp_t gfpflags,
int node); int node);
......
...@@ -490,7 +490,7 @@ static void **dbg_userword(struct kmem_cache *cachep, void *objp) ...@@ -490,7 +490,7 @@ static void **dbg_userword(struct kmem_cache *cachep, void *objp)
#endif #endif
#ifdef CONFIG_KMEMTRACE #ifdef CONFIG_TRACING
size_t slab_buffer_size(struct kmem_cache *cachep) size_t slab_buffer_size(struct kmem_cache *cachep)
{ {
return cachep->buffer_size; return cachep->buffer_size;
...@@ -3578,7 +3578,7 @@ void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags) ...@@ -3578,7 +3578,7 @@ void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags)
} }
EXPORT_SYMBOL(kmem_cache_alloc); EXPORT_SYMBOL(kmem_cache_alloc);
#ifdef CONFIG_KMEMTRACE #ifdef CONFIG_TRACING
void *kmem_cache_alloc_notrace(struct kmem_cache *cachep, gfp_t flags) void *kmem_cache_alloc_notrace(struct kmem_cache *cachep, gfp_t flags)
{ {
return __cache_alloc(cachep, flags, __builtin_return_address(0)); return __cache_alloc(cachep, flags, __builtin_return_address(0));
...@@ -3641,7 +3641,7 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid) ...@@ -3641,7 +3641,7 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid)
} }
EXPORT_SYMBOL(kmem_cache_alloc_node); EXPORT_SYMBOL(kmem_cache_alloc_node);
#ifdef CONFIG_KMEMTRACE #ifdef CONFIG_TRACING
void *kmem_cache_alloc_node_notrace(struct kmem_cache *cachep, void *kmem_cache_alloc_node_notrace(struct kmem_cache *cachep,
gfp_t flags, gfp_t flags,
int nodeid) int nodeid)
...@@ -3669,7 +3669,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, void *caller) ...@@ -3669,7 +3669,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, void *caller)
return ret; return ret;
} }
#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_KMEMTRACE) #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING)
void *__kmalloc_node(size_t size, gfp_t flags, int node) void *__kmalloc_node(size_t size, gfp_t flags, int node)
{ {
return __do_kmalloc_node(size, flags, node, return __do_kmalloc_node(size, flags, node,
...@@ -3689,7 +3689,7 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node) ...@@ -3689,7 +3689,7 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
return __do_kmalloc_node(size, flags, node, NULL); return __do_kmalloc_node(size, flags, node, NULL);
} }
EXPORT_SYMBOL(__kmalloc_node); EXPORT_SYMBOL(__kmalloc_node);
#endif /* CONFIG_DEBUG_SLAB */ #endif /* CONFIG_DEBUG_SLAB || CONFIG_TRACING */
#endif /* CONFIG_NUMA */ #endif /* CONFIG_NUMA */
/** /**
...@@ -3721,7 +3721,7 @@ static __always_inline void *__do_kmalloc(size_t size, gfp_t flags, ...@@ -3721,7 +3721,7 @@ static __always_inline void *__do_kmalloc(size_t size, gfp_t flags,
} }
#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_KMEMTRACE) #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING)
void *__kmalloc(size_t size, gfp_t flags) void *__kmalloc(size_t size, gfp_t flags)
{ {
return __do_kmalloc(size, flags, __builtin_return_address(0)); return __do_kmalloc(size, flags, __builtin_return_address(0));
......
...@@ -1754,7 +1754,7 @@ void *kmem_cache_alloc(struct kmem_cache *s, gfp_t gfpflags) ...@@ -1754,7 +1754,7 @@ void *kmem_cache_alloc(struct kmem_cache *s, gfp_t gfpflags)
} }
EXPORT_SYMBOL(kmem_cache_alloc); EXPORT_SYMBOL(kmem_cache_alloc);
#ifdef CONFIG_KMEMTRACE #ifdef CONFIG_TRACING
void *kmem_cache_alloc_notrace(struct kmem_cache *s, gfp_t gfpflags) void *kmem_cache_alloc_notrace(struct kmem_cache *s, gfp_t gfpflags)
{ {
return slab_alloc(s, gfpflags, -1, _RET_IP_); return slab_alloc(s, gfpflags, -1, _RET_IP_);
...@@ -1775,7 +1775,7 @@ void *kmem_cache_alloc_node(struct kmem_cache *s, gfp_t gfpflags, int node) ...@@ -1775,7 +1775,7 @@ void *kmem_cache_alloc_node(struct kmem_cache *s, gfp_t gfpflags, int node)
EXPORT_SYMBOL(kmem_cache_alloc_node); EXPORT_SYMBOL(kmem_cache_alloc_node);
#endif #endif
#ifdef CONFIG_KMEMTRACE #ifdef CONFIG_TRACING
void *kmem_cache_alloc_node_notrace(struct kmem_cache *s, void *kmem_cache_alloc_node_notrace(struct kmem_cache *s,
gfp_t gfpflags, gfp_t gfpflags,
int node) int node)
......
...@@ -237,8 +237,8 @@ lib = lib ...@@ -237,8 +237,8 @@ lib = lib
export prefix bindir sharedir sysconfdir export prefix bindir sharedir sysconfdir
CC = gcc CC = $(CROSS_COMPILE)gcc
AR = ar AR = $(CROSS_COMPILE)ar
RM = rm -f RM = rm -f
TAR = tar TAR = tar
FIND = find FIND = find
...@@ -356,7 +356,9 @@ LIB_H += util/parse-options.h ...@@ -356,7 +356,9 @@ LIB_H += util/parse-options.h
LIB_H += util/parse-events.h LIB_H += util/parse-events.h
LIB_H += util/quote.h LIB_H += util/quote.h
LIB_H += util/util.h LIB_H += util/util.h
LIB_H += util/header.h
LIB_H += util/help.h LIB_H += util/help.h
LIB_H += util/session.h
LIB_H += util/strbuf.h LIB_H += util/strbuf.h
LIB_H += util/string.h LIB_H += util/string.h
LIB_H += util/strlist.h LIB_H += util/strlist.h
...@@ -405,6 +407,7 @@ LIB_OBJS += util/callchain.o ...@@ -405,6 +407,7 @@ LIB_OBJS += util/callchain.o
LIB_OBJS += util/values.o LIB_OBJS += util/values.o
LIB_OBJS += util/debug.o LIB_OBJS += util/debug.o
LIB_OBJS += util/map.o LIB_OBJS += util/map.o
LIB_OBJS += util/session.o
LIB_OBJS += util/thread.o LIB_OBJS += util/thread.o
LIB_OBJS += util/trace-event-parse.o LIB_OBJS += util/trace-event-parse.o
LIB_OBJS += util/trace-event-read.o LIB_OBJS += util/trace-event-read.o
...@@ -492,8 +495,10 @@ else ...@@ -492,8 +495,10 @@ else
LIB_OBJS += util/probe-finder.o LIB_OBJS += util/probe-finder.o
endif endif
ifndef NO_LIBPERL
PERL_EMBED_LDOPTS = `perl -MExtUtils::Embed -e ldopts 2>/dev/null` PERL_EMBED_LDOPTS = `perl -MExtUtils::Embed -e ldopts 2>/dev/null`
PERL_EMBED_CCOPTS = `perl -MExtUtils::Embed -e ccopts 2>/dev/null` PERL_EMBED_CCOPTS = `perl -MExtUtils::Embed -e ccopts 2>/dev/null`
endif
ifneq ($(shell sh -c "(echo '\#include <EXTERN.h>'; echo '\#include <perl.h>'; echo 'int main(void) { perl_alloc(); return 0; }') | $(CC) -x c - $(PERL_EMBED_CCOPTS) -o /dev/null $(PERL_EMBED_LDOPTS) > /dev/null 2>&1 && echo y"), y) ifneq ($(shell sh -c "(echo '\#include <EXTERN.h>'; echo '\#include <perl.h>'; echo 'int main(void) { perl_alloc(); return 0; }') | $(CC) -x c - $(PERL_EMBED_CCOPTS) -o /dev/null $(PERL_EMBED_LDOPTS) > /dev/null 2>&1 && echo y"), y)
BASIC_CFLAGS += -DNO_LIBPERL BASIC_CFLAGS += -DNO_LIBPERL
......
/* /*
* *
* builtin-bench-messaging.c * sched-messaging.c
* *
* messaging: Benchmark for scheduler and IPC mechanisms * messaging: Benchmark for scheduler and IPC mechanisms
* *
...@@ -320,10 +320,12 @@ int bench_sched_messaging(int argc, const char **argv, ...@@ -320,10 +320,12 @@ int bench_sched_messaging(int argc, const char **argv,
num_groups, num_groups * 2 * num_fds, num_groups, num_groups * 2 * num_fds,
thread_mode ? "threads" : "processes"); thread_mode ? "threads" : "processes");
printf(" %14s: %lu.%03lu [sec]\n", "Total time", printf(" %14s: %lu.%03lu [sec]\n", "Total time",
diff.tv_sec, diff.tv_usec/1000); diff.tv_sec,
(unsigned long) (diff.tv_usec/1000));
break; break;
case BENCH_FORMAT_SIMPLE: case BENCH_FORMAT_SIMPLE:
printf("%lu.%03lu\n", diff.tv_sec, diff.tv_usec/1000); printf("%lu.%03lu\n", diff.tv_sec,
(unsigned long) (diff.tv_usec/1000));
break; break;
default: default:
/* reaching here is something disaster */ /* reaching here is something disaster */
......
/* /*
* *
* builtin-bench-pipe.c * sched-pipe.c
* *
* pipe: Benchmark for pipe() * pipe: Benchmark for pipe()
* *
...@@ -87,7 +87,8 @@ int bench_sched_pipe(int argc, const char **argv, ...@@ -87,7 +87,8 @@ int bench_sched_pipe(int argc, const char **argv,
if (pid) { if (pid) {
retpid = waitpid(pid, &wait_stat, 0); retpid = waitpid(pid, &wait_stat, 0);
assert((retpid == pid) && WIFEXITED(wait_stat)); assert((retpid == pid) && WIFEXITED(wait_stat));
return 0; } else {
exit(0);
} }
switch (bench_format) { switch (bench_format) {
...@@ -99,7 +100,8 @@ int bench_sched_pipe(int argc, const char **argv, ...@@ -99,7 +100,8 @@ int bench_sched_pipe(int argc, const char **argv,
result_usec += diff.tv_usec; result_usec += diff.tv_usec;
printf(" %14s: %lu.%03lu [sec]\n\n", "Total time", printf(" %14s: %lu.%03lu [sec]\n\n", "Total time",
diff.tv_sec, diff.tv_usec/1000); diff.tv_sec,
(unsigned long) (diff.tv_usec/1000));
printf(" %14lf usecs/op\n", printf(" %14lf usecs/op\n",
(double)result_usec / (double)loops); (double)result_usec / (double)loops);
...@@ -110,7 +112,8 @@ int bench_sched_pipe(int argc, const char **argv, ...@@ -110,7 +112,8 @@ int bench_sched_pipe(int argc, const char **argv,
case BENCH_FORMAT_SIMPLE: case BENCH_FORMAT_SIMPLE:
printf("%lu.%03lu\n", printf("%lu.%03lu\n",
diff.tv_sec, diff.tv_usec / 1000); diff.tv_sec,
(unsigned long) (diff.tv_usec / 1000));
break; break;
default: default:
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "util/thread.h" #include "util/thread.h"
#include "util/sort.h" #include "util/sort.h"
#include "util/hist.h" #include "util/hist.h"
#include "util/session.h"
#include "util/data_map.h" #include "util/data_map.h"
static char const *input_name = "perf.data"; static char const *input_name = "perf.data";
...@@ -462,21 +463,23 @@ static struct perf_file_handler file_handler = { ...@@ -462,21 +463,23 @@ static struct perf_file_handler file_handler = {
static int __cmd_annotate(void) static int __cmd_annotate(void)
{ {
struct perf_header *header; struct perf_session *session = perf_session__new(input_name, O_RDONLY, force);
struct thread *idle; struct thread *idle;
int ret; int ret;
if (session == NULL)
return -ENOMEM;
idle = register_idle_thread(); idle = register_idle_thread();
register_perf_file_handler(&file_handler); register_perf_file_handler(&file_handler);
ret = mmap_dispatch_perf_file(&header, input_name, 0, 0, ret = perf_session__process_events(session, 0, &event__cwdlen, &event__cwd);
&event__cwdlen, &event__cwd);
if (ret) if (ret)
return ret; goto out_delete;
if (dump_trace) { if (dump_trace) {
event__print_totals(); event__print_totals();
return 0; goto out_delete;
} }
if (verbose > 3) if (verbose > 3)
...@@ -489,6 +492,8 @@ static int __cmd_annotate(void) ...@@ -489,6 +492,8 @@ static int __cmd_annotate(void)
output__resort(event__total[0]); output__resort(event__total[0]);
find_annotations(); find_annotations();
out_delete:
perf_session__delete(session);
return ret; return ret;
} }
......
...@@ -31,6 +31,9 @@ struct bench_suite { ...@@ -31,6 +31,9 @@ struct bench_suite {
const char *summary; const char *summary;
int (*fn)(int, const char **, const char *); int (*fn)(int, const char **, const char *);
}; };
\
/* sentinel: easy for help */
#define suite_all { "all", "test all suite (pseudo suite)", NULL }
static struct bench_suite sched_suites[] = { static struct bench_suite sched_suites[] = {
{ "messaging", { "messaging",
...@@ -39,6 +42,7 @@ static struct bench_suite sched_suites[] = { ...@@ -39,6 +42,7 @@ static struct bench_suite sched_suites[] = {
{ "pipe", { "pipe",
"Flood of communication over pipe() between two processes", "Flood of communication over pipe() between two processes",
bench_sched_pipe }, bench_sched_pipe },
suite_all,
{ NULL, { NULL,
NULL, NULL,
NULL } NULL }
...@@ -48,6 +52,7 @@ static struct bench_suite mem_suites[] = { ...@@ -48,6 +52,7 @@ static struct bench_suite mem_suites[] = {
{ "memcpy", { "memcpy",
"Simple memory copy in various ways", "Simple memory copy in various ways",
bench_mem_memcpy }, bench_mem_memcpy },
suite_all,
{ NULL, { NULL,
NULL, NULL,
NULL } NULL }
...@@ -66,6 +71,9 @@ static struct bench_subsys subsystems[] = { ...@@ -66,6 +71,9 @@ static struct bench_subsys subsystems[] = {
{ "mem", { "mem",
"memory access performance", "memory access performance",
mem_suites }, mem_suites },
{ "all", /* sentinel: easy for help */
"test all subsystem (pseudo subsystem)",
NULL },
{ NULL, { NULL,
NULL, NULL,
NULL } NULL }
...@@ -75,11 +83,11 @@ static void dump_suites(int subsys_index) ...@@ -75,11 +83,11 @@ static void dump_suites(int subsys_index)
{ {
int i; int i;
printf("List of available suites for %s...\n\n", printf("# List of available suites for %s...\n\n",
subsystems[subsys_index].name); subsystems[subsys_index].name);
for (i = 0; subsystems[subsys_index].suites[i].name; i++) for (i = 0; subsystems[subsys_index].suites[i].name; i++)
printf("\t%s: %s\n", printf("%14s: %s\n",
subsystems[subsys_index].suites[i].name, subsystems[subsys_index].suites[i].name,
subsystems[subsys_index].suites[i].summary); subsystems[subsys_index].suites[i].summary);
...@@ -110,10 +118,10 @@ static void print_usage(void) ...@@ -110,10 +118,10 @@ static void print_usage(void)
printf("\t%s\n", bench_usage[i]); printf("\t%s\n", bench_usage[i]);
printf("\n"); printf("\n");
printf("List of available subsystems...\n\n"); printf("# List of available subsystems...\n\n");
for (i = 0; subsystems[i].name; i++) for (i = 0; subsystems[i].name; i++)
printf("\t%s: %s\n", printf("%14s: %s\n",
subsystems[i].name, subsystems[i].summary); subsystems[i].name, subsystems[i].summary);
printf("\n"); printf("\n");
} }
...@@ -131,6 +139,37 @@ static int bench_str2int(char *str) ...@@ -131,6 +139,37 @@ static int bench_str2int(char *str)
return BENCH_FORMAT_UNKNOWN; return BENCH_FORMAT_UNKNOWN;
} }
static void all_suite(struct bench_subsys *subsys) /* FROM HERE */
{
int i;
const char *argv[2];
struct bench_suite *suites = subsys->suites;
argv[1] = NULL;
/*
* TODO:
* preparing preset parameters for
* embedded, ordinary PC, HPC, etc...
* will be helpful
*/
for (i = 0; suites[i].fn; i++) {
printf("# Running %s/%s benchmark...\n",
subsys->name,
suites[i].name);
argv[1] = suites[i].name;
suites[i].fn(1, argv, NULL);
printf("\n");
}
}
static void all_subsystem(void)
{
int i;
for (i = 0; subsystems[i].suites; i++)
all_suite(&subsystems[i]);
}
int cmd_bench(int argc, const char **argv, const char *prefix __used) int cmd_bench(int argc, const char **argv, const char *prefix __used)
{ {
int i, j, status = 0; int i, j, status = 0;
...@@ -155,6 +194,11 @@ int cmd_bench(int argc, const char **argv, const char *prefix __used) ...@@ -155,6 +194,11 @@ int cmd_bench(int argc, const char **argv, const char *prefix __used)
goto end; goto end;
} }
if (!strcmp(argv[0], "all")) {
all_subsystem();
goto end;
}
for (i = 0; subsystems[i].name; i++) { for (i = 0; subsystems[i].name; i++) {
if (strcmp(subsystems[i].name, argv[0])) if (strcmp(subsystems[i].name, argv[0]))
continue; continue;
...@@ -165,6 +209,11 @@ int cmd_bench(int argc, const char **argv, const char *prefix __used) ...@@ -165,6 +209,11 @@ int cmd_bench(int argc, const char **argv, const char *prefix __used)
goto end; goto end;
} }
if (!strcmp(argv[1], "all")) {
all_suite(&subsystems[i]);
goto end;
}
for (j = 0; subsystems[i].suites[j].name; j++) { for (j = 0; subsystems[i].suites[j].name; j++) {
if (strcmp(subsystems[i].suites[j].name, argv[1])) if (strcmp(subsystems[i].suites[j].name, argv[1]))
continue; continue;
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
#include "util/cache.h" #include "util/cache.h"
#include "util/data_map.h" #include "util/data_map.h"
#include "util/debug.h" #include "util/debug.h"
#include "util/header.h"
#include "util/parse-options.h" #include "util/parse-options.h"
#include "util/session.h"
#include "util/symbol.h" #include "util/symbol.h"
static char const *input_name = "perf.data"; static char const *input_name = "perf.data";
...@@ -55,56 +55,17 @@ static int perf_file_section__process_buildids(struct perf_file_section *self, ...@@ -55,56 +55,17 @@ static int perf_file_section__process_buildids(struct perf_file_section *self,
static int __cmd_buildid_list(void) static int __cmd_buildid_list(void)
{ {
int err = -1; int err = -1;
struct perf_header *header; struct perf_session *session = perf_session__new(input_name, O_RDONLY, force);
struct perf_file_header f_header;
struct stat input_stat;
int input = open(input_name, O_RDONLY);
if (input < 0) { if (session == NULL)
pr_err("failed to open file: %s", input_name); return -1;
if (!strcmp(input_name, "perf.data"))
pr_err(" (try 'perf record' first)");
pr_err("\n");
goto out;
}
err = fstat(input, &input_stat);
if (err < 0) {
perror("failed to stat file");
goto out_close;
}
if (!force && input_stat.st_uid && (input_stat.st_uid != geteuid())) {
pr_err("file %s not owned by current user or root\n",
input_name);
goto out_close;
}
if (!input_stat.st_size) {
pr_info("zero-sized file, nothing to do!\n");
goto out_close;
}
err = -1;
header = perf_header__new();
if (header == NULL)
goto out_close;
if (perf_file_header__read(&f_header, header, input) < 0) {
pr_warning("incompatible file format");
goto out_close;
}
err = perf_header__process_sections(header, input, err = perf_header__process_sections(&session->header, session->fd,
perf_file_section__process_buildids); perf_file_section__process_buildids);
if (err >= 0)
if (err < 0)
goto out_close;
dsos__fprintf_buildid(stdout); dsos__fprintf_buildid(stdout);
out_close:
close(input); perf_session__delete(session);
out:
return err; return err;
} }
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "util/symbol.h" #include "util/symbol.h"
#include "util/thread.h" #include "util/thread.h"
#include "util/header.h" #include "util/header.h"
#include "util/session.h"
#include "util/parse-options.h" #include "util/parse-options.h"
#include "util/trace-event.h" #include "util/trace-event.h"
...@@ -20,7 +21,6 @@ typedef int (*sort_fn_t)(struct alloc_stat *, struct alloc_stat *); ...@@ -20,7 +21,6 @@ typedef int (*sort_fn_t)(struct alloc_stat *, struct alloc_stat *);
static char const *input_name = "perf.data"; static char const *input_name = "perf.data";
static struct perf_header *header;
static u64 sample_type; static u64 sample_type;
static int alloc_flag; static int alloc_flag;
...@@ -367,11 +367,18 @@ static struct perf_file_handler file_handler = { ...@@ -367,11 +367,18 @@ static struct perf_file_handler file_handler = {
static int read_events(void) static int read_events(void)
{ {
int err;
struct perf_session *session = perf_session__new(input_name, O_RDONLY, 0);
if (session == NULL)
return -ENOMEM;
register_idle_thread(); register_idle_thread();
register_perf_file_handler(&file_handler); register_perf_file_handler(&file_handler);
return mmap_dispatch_perf_file(&header, input_name, 0, 0, err = perf_session__process_events(session, 0, &event__cwdlen, &event__cwd);
&event__cwdlen, &event__cwd); perf_session__delete(session);
return err;
} }
static double fragmentation(unsigned long n_req, unsigned long n_alloc) static double fragmentation(unsigned long n_req, unsigned long n_alloc)
...@@ -403,7 +410,7 @@ static void __print_result(struct rb_root *root, int n_lines, int is_caller) ...@@ -403,7 +410,7 @@ static void __print_result(struct rb_root *root, int n_lines, int is_caller)
if (is_caller) { if (is_caller) {
addr = data->call_site; addr = data->call_site;
if (!raw_ip) if (!raw_ip)
sym = thread__find_function(kthread, addr, NULL); sym = map_groups__find_function(kmaps, addr, NULL);
} else } else
addr = data->ptr; addr = data->ptr;
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "util/header.h" #include "util/header.h"
#include "util/event.h" #include "util/event.h"
#include "util/debug.h" #include "util/debug.h"
#include "util/session.h"
#include "util/symbol.h" #include "util/symbol.h"
#include <unistd.h> #include <unistd.h>
...@@ -62,7 +63,7 @@ static int nr_cpu = 0; ...@@ -62,7 +63,7 @@ static int nr_cpu = 0;
static int file_new = 1; static int file_new = 1;
struct perf_header *header = NULL; static struct perf_session *session;
struct mmap_data { struct mmap_data {
int counter; int counter;
...@@ -216,12 +217,12 @@ static struct perf_header_attr *get_header_attr(struct perf_event_attr *a, int n ...@@ -216,12 +217,12 @@ static struct perf_header_attr *get_header_attr(struct perf_event_attr *a, int n
{ {
struct perf_header_attr *h_attr; struct perf_header_attr *h_attr;
if (nr < header->attrs) { if (nr < session->header.attrs) {
h_attr = header->attr[nr]; h_attr = session->header.attr[nr];
} else { } else {
h_attr = perf_header_attr__new(a); h_attr = perf_header_attr__new(a);
if (h_attr != NULL) if (h_attr != NULL)
if (perf_header__add_attr(header, h_attr) < 0) { if (perf_header__add_attr(&session->header, h_attr) < 0) {
perf_header_attr__delete(h_attr); perf_header_attr__delete(h_attr);
h_attr = NULL; h_attr = NULL;
} }
...@@ -395,9 +396,9 @@ static void open_counters(int cpu, pid_t pid) ...@@ -395,9 +396,9 @@ static void open_counters(int cpu, pid_t pid)
static void atexit_header(void) static void atexit_header(void)
{ {
header->data_size += bytes_written; session->header.data_size += bytes_written;
perf_header__write(header, output, true); perf_header__write(&session->header, output, true);
} }
static int __cmd_record(int argc, const char **argv) static int __cmd_record(int argc, const char **argv)
...@@ -440,24 +441,24 @@ static int __cmd_record(int argc, const char **argv) ...@@ -440,24 +441,24 @@ static int __cmd_record(int argc, const char **argv)
exit(-1); exit(-1);
} }
header = perf_header__new(); session = perf_session__new(output_name, O_WRONLY, force);
if (header == NULL) { if (session == NULL) {
pr_err("Not enough memory for reading perf file header\n"); pr_err("Not enough memory for reading perf file header\n");
return -1; return -1;
} }
if (!file_new) { if (!file_new) {
err = perf_header__read(header, output); err = perf_header__read(&session->header, output);
if (err < 0) if (err < 0)
return err; return err;
} }
if (raw_samples) { if (raw_samples) {
perf_header__set_feat(header, HEADER_TRACE_INFO); perf_header__set_feat(&session->header, HEADER_TRACE_INFO);
} else { } else {
for (i = 0; i < nr_counters; i++) { for (i = 0; i < nr_counters; i++) {
if (attrs[i].sample_type & PERF_SAMPLE_RAW) { if (attrs[i].sample_type & PERF_SAMPLE_RAW) {
perf_header__set_feat(header, HEADER_TRACE_INFO); perf_header__set_feat(&session->header, HEADER_TRACE_INFO);
break; break;
} }
} }
...@@ -481,7 +482,7 @@ static int __cmd_record(int argc, const char **argv) ...@@ -481,7 +482,7 @@ static int __cmd_record(int argc, const char **argv)
} }
if (file_new) { if (file_new) {
err = perf_header__write(header, output, false); err = perf_header__write(&session->header, output, false);
if (err < 0) if (err < 0)
return err; return err;
} }
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "perf.h" #include "perf.h"
#include "util/debug.h" #include "util/debug.h"
#include "util/header.h" #include "util/header.h"
#include "util/session.h"
#include "util/parse-options.h" #include "util/parse-options.h"
#include "util/parse-events.h" #include "util/parse-events.h"
...@@ -52,7 +53,7 @@ static int exclude_other = 1; ...@@ -52,7 +53,7 @@ static int exclude_other = 1;
static char callchain_default_opt[] = "fractal,0.5"; static char callchain_default_opt[] = "fractal,0.5";
static struct perf_header *header; static struct perf_session *session;
static u64 sample_type; static u64 sample_type;
...@@ -701,7 +702,7 @@ static int process_read_event(event_t *event) ...@@ -701,7 +702,7 @@ static int process_read_event(event_t *event)
{ {
struct perf_event_attr *attr; struct perf_event_attr *attr;
attr = perf_header__find_attr(event->read.id, header); attr = perf_header__find_attr(event->read.id, &session->header);
if (show_threads) { if (show_threads) {
const char *name = attr ? __event_name(attr->type, attr->config) const char *name = attr ? __event_name(attr->type, attr->config)
...@@ -766,6 +767,10 @@ static int __cmd_report(void) ...@@ -766,6 +767,10 @@ static int __cmd_report(void)
struct thread *idle; struct thread *idle;
int ret; int ret;
session = perf_session__new(input_name, O_RDONLY, force);
if (session == NULL)
return -ENOMEM;
idle = register_idle_thread(); idle = register_idle_thread();
thread__comm_adjust(idle); thread__comm_adjust(idle);
...@@ -774,14 +779,14 @@ static int __cmd_report(void) ...@@ -774,14 +779,14 @@ static int __cmd_report(void)
register_perf_file_handler(&file_handler); register_perf_file_handler(&file_handler);
ret = mmap_dispatch_perf_file(&header, input_name, force, ret = perf_session__process_events(session, full_paths,
full_paths, &event__cwdlen, &event__cwd); &event__cwdlen, &event__cwd);
if (ret) if (ret)
return ret; goto out_delete;
if (dump_trace) { if (dump_trace) {
event__print_totals(); event__print_totals();
return 0; goto out_delete;
} }
if (verbose > 3) if (verbose > 3)
...@@ -796,7 +801,8 @@ static int __cmd_report(void) ...@@ -796,7 +801,8 @@ static int __cmd_report(void)
if (show_threads) if (show_threads)
perf_read_values_destroy(&show_threads_values); perf_read_values_destroy(&show_threads_values);
out_delete:
perf_session__delete(session);
return ret; return ret;
} }
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "util/symbol.h" #include "util/symbol.h"
#include "util/thread.h" #include "util/thread.h"
#include "util/header.h" #include "util/header.h"
#include "util/session.h"
#include "util/parse-options.h" #include "util/parse-options.h"
#include "util/trace-event.h" #include "util/trace-event.h"
...@@ -21,7 +22,6 @@ ...@@ -21,7 +22,6 @@
static char const *input_name = "perf.data"; static char const *input_name = "perf.data";
static struct perf_header *header;
static u64 sample_type; static u64 sample_type;
static char default_sort_order[] = "avg, max, switch, runtime"; static char default_sort_order[] = "avg, max, switch, runtime";
...@@ -1663,11 +1663,18 @@ static struct perf_file_handler file_handler = { ...@@ -1663,11 +1663,18 @@ static struct perf_file_handler file_handler = {
static int read_events(void) static int read_events(void)
{ {
int err;
struct perf_session *session = perf_session__new(input_name, O_RDONLY, 0);
if (session == NULL)
return -ENOMEM;
register_idle_thread(); register_idle_thread();
register_perf_file_handler(&file_handler); register_perf_file_handler(&file_handler);
return mmap_dispatch_perf_file(&header, input_name, 0, 0, err = perf_session__process_events(session, 0, &event__cwdlen, &event__cwd);
&event__cwdlen, &event__cwd); perf_session__delete(session);
return err;
} }
static void print_bad_events(void) static void print_bad_events(void)
......
...@@ -1059,15 +1059,17 @@ static struct perf_file_handler file_handler = { ...@@ -1059,15 +1059,17 @@ static struct perf_file_handler file_handler = {
static int __cmd_timechart(void) static int __cmd_timechart(void)
{ {
struct perf_header *header; struct perf_session *session = perf_session__new(input_name, O_RDONLY, 0);
int ret; int ret;
if (session == NULL)
return -ENOMEM;
register_perf_file_handler(&file_handler); register_perf_file_handler(&file_handler);
ret = mmap_dispatch_perf_file(&header, input_name, 0, 0, ret = perf_session__process_events(session, 0, &event__cwdlen, &event__cwd);
&event__cwdlen, &event__cwd);
if (ret) if (ret)
return EXIT_FAILURE; goto out_delete;
process_samples(); process_samples();
...@@ -1079,8 +1081,9 @@ static int __cmd_timechart(void) ...@@ -1079,8 +1081,9 @@ static int __cmd_timechart(void)
pr_info("Written %2.1f seconds of trace to %s.\n", pr_info("Written %2.1f seconds of trace to %s.\n",
(last_time - first_time) / 1000000000.0, output_name); (last_time - first_time) / 1000000000.0, output_name);
out_delete:
return EXIT_SUCCESS; perf_session__delete(session);
return ret;
} }
static const char * const timechart_usage[] = { static const char * const timechart_usage[] = {
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include "util/header.h" #include "util/header.h"
#include "util/exec_cmd.h" #include "util/exec_cmd.h"
#include "util/trace-event.h" #include "util/trace-event.h"
#include "util/session.h"
static char const *script_name; static char const *script_name;
static char const *generate_script_lang; static char const *generate_script_lang;
...@@ -61,7 +62,7 @@ static int cleanup_scripting(void) ...@@ -61,7 +62,7 @@ static int cleanup_scripting(void)
static char const *input_name = "perf.data"; static char const *input_name = "perf.data";
static struct perf_header *header; static struct perf_session *session;
static u64 sample_type; static u64 sample_type;
static int process_sample_event(event_t *event) static int process_sample_event(event_t *event)
...@@ -126,11 +127,18 @@ static struct perf_file_handler file_handler = { ...@@ -126,11 +127,18 @@ static struct perf_file_handler file_handler = {
static int __cmd_trace(void) static int __cmd_trace(void)
{ {
int err;
session = perf_session__new(input_name, O_RDONLY, 0);
if (session == NULL)
return -ENOMEM;
register_idle_thread(); register_idle_thread();
register_perf_file_handler(&file_handler); register_perf_file_handler(&file_handler);
return mmap_dispatch_perf_file(&header, input_name, err = perf_session__process_events(session, 0, &event__cwdlen, &event__cwd);
0, 0, &event__cwdlen, &event__cwd); perf_session__delete(session);
return err;
} }
struct script_spec { struct script_spec {
...@@ -348,11 +356,7 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used) ...@@ -348,11 +356,7 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used)
return -1; return -1;
} }
header = perf_header__new(); perf_header__read(&session->header, input);
if (header == NULL)
return -1;
perf_header__read(header, input);
err = scripting_ops->generate_script("perf-trace"); err = scripting_ops->generate_script("perf-trace");
goto out; goto out;
} }
......
...@@ -59,6 +59,18 @@ ...@@ -59,6 +59,18 @@
#define cpu_relax() asm volatile ("hint @pause" ::: "memory") #define cpu_relax() asm volatile ("hint @pause" ::: "memory")
#endif #endif
#ifdef __arm__
#include "../../arch/arm/include/asm/unistd.h"
/*
* Use the __kuser_memory_barrier helper in the CPU helper page. See
* arch/arm/kernel/entry-armv.S in the kernel source for details.
*/
#define rmb() asm volatile("mov r0, #0xffff0fff; mov lr, pc;" \
"sub pc, r0, #95" ::: "r0", "lr", "cc", \
"memory")
#define cpu_relax() asm volatile("":::"memory")
#endif
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
......
...@@ -129,23 +129,16 @@ int perf_header__read_build_ids(int input, u64 offset, u64 size) ...@@ -129,23 +129,16 @@ int perf_header__read_build_ids(int input, u64 offset, u64 size)
return err; return err;
} }
int mmap_dispatch_perf_file(struct perf_header **pheader, int perf_session__process_events(struct perf_session *self,
const char *input_name, int full_paths, int *cwdlen, char **cwd)
int force,
int full_paths,
int *cwdlen,
char **cwd)
{ {
int err; int err;
struct perf_header *header;
unsigned long head, shift; unsigned long head, shift;
unsigned long offset = 0; unsigned long offset = 0;
struct stat input_stat;
size_t page_size; size_t page_size;
u64 sample_type; u64 sample_type;
event_t *event; event_t *event;
uint32_t size; uint32_t size;
int input;
char *buf; char *buf;
if (curr_handler == NULL) { if (curr_handler == NULL) {
...@@ -155,56 +148,19 @@ int mmap_dispatch_perf_file(struct perf_header **pheader, ...@@ -155,56 +148,19 @@ int mmap_dispatch_perf_file(struct perf_header **pheader,
page_size = getpagesize(); page_size = getpagesize();
input = open(input_name, O_RDONLY); head = self->header.data_offset;
if (input < 0) { sample_type = perf_header__sample_type(&self->header);
pr_err("Failed to open file: %s", input_name);
if (!strcmp(input_name, "perf.data"))
pr_err(" (try 'perf record' first)");
pr_err("\n");
return -errno;
}
if (fstat(input, &input_stat) < 0) {
pr_err("failed to stat file");
err = -errno;
goto out_close;
}
err = -EACCES;
if (!force && input_stat.st_uid && (input_stat.st_uid != geteuid())) {
pr_err("file: %s not owned by current user or root\n",
input_name);
goto out_close;
}
if (input_stat.st_size == 0) {
pr_info("zero-sized file, nothing to do!\n");
goto done;
}
err = -ENOMEM;
header = perf_header__new();
if (header == NULL)
goto out_close;
err = perf_header__read(header, input);
if (err < 0)
goto out_delete;
*pheader = header;
head = header->data_offset;
sample_type = perf_header__sample_type(header);
err = -EINVAL; err = -EINVAL;
if (curr_handler->sample_type_check && if (curr_handler->sample_type_check &&
curr_handler->sample_type_check(sample_type) < 0) curr_handler->sample_type_check(sample_type) < 0)
goto out_delete; goto out_err;
if (!full_paths) { if (!full_paths) {
if (getcwd(__cwd, sizeof(__cwd)) == NULL) { if (getcwd(__cwd, sizeof(__cwd)) == NULL) {
pr_err("failed to get the current directory\n"); pr_err("failed to get the current directory\n");
err = -errno; err = -errno;
goto out_delete; goto out_err;
} }
*cwd = __cwd; *cwd = __cwd;
*cwdlen = strlen(*cwd); *cwdlen = strlen(*cwd);
...@@ -219,11 +175,11 @@ int mmap_dispatch_perf_file(struct perf_header **pheader, ...@@ -219,11 +175,11 @@ int mmap_dispatch_perf_file(struct perf_header **pheader,
remap: remap:
buf = mmap(NULL, page_size * mmap_window, PROT_READ, buf = mmap(NULL, page_size * mmap_window, PROT_READ,
MAP_SHARED, input, offset); MAP_SHARED, self->fd, offset);
if (buf == MAP_FAILED) { if (buf == MAP_FAILED) {
pr_err("failed to mmap file\n"); pr_err("failed to mmap file\n");
err = -errno; err = -errno;
goto out_delete; goto out_err;
} }
more: more:
...@@ -273,19 +229,14 @@ int mmap_dispatch_perf_file(struct perf_header **pheader, ...@@ -273,19 +229,14 @@ int mmap_dispatch_perf_file(struct perf_header **pheader,
head += size; head += size;
if (offset + head >= header->data_offset + header->data_size) if (offset + head >= self->header.data_offset + self->header.data_size)
goto done; goto done;
if (offset + head < (unsigned long)input_stat.st_size) if (offset + head < self->size)
goto more; goto more;
done: done:
err = 0; err = 0;
out_close: out_err:
close(input);
return err; return err;
out_delete:
perf_header__delete(header);
goto out_close;
} }
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#include "event.h" #include "event.h"
#include "header.h" #include "header.h"
#include "session.h"
typedef int (*event_type_handler_t)(event_t *); typedef int (*event_type_handler_t)(event_t *);
...@@ -21,12 +22,8 @@ struct perf_file_handler { ...@@ -21,12 +22,8 @@ struct perf_file_handler {
}; };
void register_perf_file_handler(struct perf_file_handler *handler); void register_perf_file_handler(struct perf_file_handler *handler);
int mmap_dispatch_perf_file(struct perf_header **pheader, int perf_session__process_events(struct perf_session *self,
const char *input_name, int full_paths, int *cwdlen, char **cwd);
int force,
int full_paths,
int *cwdlen,
char **cwd);
int perf_header__read_build_ids(int input, u64 offset, u64 file_size); int perf_header__read_build_ids(int input, u64 offset, u64 file_size);
#endif #endif
...@@ -254,13 +254,14 @@ void thread__find_addr_location(struct thread *self, u8 cpumode, ...@@ -254,13 +254,14 @@ void thread__find_addr_location(struct thread *self, u8 cpumode,
struct addr_location *al, struct addr_location *al,
symbol_filter_t filter) symbol_filter_t filter)
{ {
struct thread *thread = al->thread = self; struct map_groups *mg = &self->mg;
al->thread = self;
al->addr = addr; al->addr = addr;
if (cpumode & PERF_RECORD_MISC_KERNEL) { if (cpumode & PERF_RECORD_MISC_KERNEL) {
al->level = 'k'; al->level = 'k';
thread = kthread; mg = kmaps;
} else if (cpumode & PERF_RECORD_MISC_USER) } else if (cpumode & PERF_RECORD_MISC_USER)
al->level = '.'; al->level = '.';
else { else {
...@@ -270,7 +271,7 @@ void thread__find_addr_location(struct thread *self, u8 cpumode, ...@@ -270,7 +271,7 @@ void thread__find_addr_location(struct thread *self, u8 cpumode,
return; return;
} }
try_again: try_again:
al->map = thread__find_map(thread, type, al->addr); al->map = map_groups__find(mg, type, al->addr);
if (al->map == NULL) { if (al->map == NULL) {
/* /*
* If this is outside of all known maps, and is a negative * If this is outside of all known maps, and is a negative
...@@ -281,8 +282,8 @@ void thread__find_addr_location(struct thread *self, u8 cpumode, ...@@ -281,8 +282,8 @@ void thread__find_addr_location(struct thread *self, u8 cpumode,
* "[vdso]" dso, but for now lets use the old trick of looking * "[vdso]" dso, but for now lets use the old trick of looking
* in the whole kernel symbol list. * in the whole kernel symbol list.
*/ */
if ((long long)al->addr < 0 && thread != kthread) { if ((long long)al->addr < 0 && mg != kmaps) {
thread = kthread; mg = kmaps;
goto try_again; goto try_again;
} }
al->sym = NULL; al->sym = NULL;
......
...@@ -103,10 +103,11 @@ void event__print_totals(void); ...@@ -103,10 +103,11 @@ void event__print_totals(void);
enum map_type { enum map_type {
MAP__FUNCTION = 0, MAP__FUNCTION = 0,
MAP__VARIABLE,
MAP__NR_TYPES,
}; };
#define MAP__NR_TYPES (MAP__VARIABLE + 1)
struct map { struct map {
union { union {
struct rb_node rb_node; struct rb_node rb_node;
...@@ -150,6 +151,8 @@ int map__overlap(struct map *l, struct map *r); ...@@ -150,6 +151,8 @@ int map__overlap(struct map *l, struct map *r);
size_t map__fprintf(struct map *self, FILE *fp); size_t map__fprintf(struct map *self, FILE *fp);
struct symbol *map__find_symbol(struct map *self, u64 addr, struct symbol *map__find_symbol(struct map *self, u64 addr,
symbol_filter_t filter); symbol_filter_t filter);
struct symbol *map__find_symbol_by_name(struct map *self, const char *name,
symbol_filter_t filter);
void map__fixup_start(struct map *self); void map__fixup_start(struct map *self);
void map__fixup_end(struct map *self); void map__fixup_end(struct map *self);
......
...@@ -58,35 +58,19 @@ int perf_header_attr__add_id(struct perf_header_attr *self, u64 id) ...@@ -58,35 +58,19 @@ int perf_header_attr__add_id(struct perf_header_attr *self, u64 id)
return 0; return 0;
} }
/* int perf_header__init(struct perf_header *self)
* Create new perf.data header:
*/
struct perf_header *perf_header__new(void)
{ {
struct perf_header *self = zalloc(sizeof(*self));
if (self != NULL) {
self->size = 1; self->size = 1;
self->attr = malloc(sizeof(void *)); self->attr = malloc(sizeof(void *));
return self->attr == NULL ? -ENOMEM : 0;
if (self->attr == NULL) {
free(self);
self = NULL;
}
}
return self;
} }
void perf_header__delete(struct perf_header *self) void perf_header__exit(struct perf_header *self)
{ {
int i; int i;
for (i = 0; i < self->attrs; ++i) for (i = 0; i < self->attrs; ++i)
perf_header_attr__delete(self->attr[i]); perf_header_attr__delete(self->attr[i]);
free(self->attr); free(self->attr);
free(self);
} }
int perf_header__add_attr(struct perf_header *self, int perf_header__add_attr(struct perf_header *self,
......
...@@ -55,8 +55,8 @@ struct perf_header { ...@@ -55,8 +55,8 @@ struct perf_header {
DECLARE_BITMAP(adds_features, HEADER_FEAT_BITS); DECLARE_BITMAP(adds_features, HEADER_FEAT_BITS);
}; };
struct perf_header *perf_header__new(void); int perf_header__init(struct perf_header *self);
void perf_header__delete(struct perf_header *self); void perf_header__exit(struct perf_header *self);
int perf_header__read(struct perf_header *self, int fd); int perf_header__read(struct perf_header *self, int fd);
int perf_header__write(struct perf_header *self, int fd, bool at_exit); int perf_header__write(struct perf_header *self, int fd, bool at_exit);
......
...@@ -104,10 +104,9 @@ void map__fixup_end(struct map *self) ...@@ -104,10 +104,9 @@ void map__fixup_end(struct map *self)
#define DSO__DELETED "(deleted)" #define DSO__DELETED "(deleted)"
struct symbol *map__find_symbol(struct map *self, u64 addr, static int map__load(struct map *self, symbol_filter_t filter)
symbol_filter_t filter)
{ {
if (!dso__loaded(self->dso, self->type)) { const char *name = self->dso->long_name;
int nr = dso__load(self->dso, self, filter); int nr = dso__load(self->dso, self, filter);
if (nr < 0) { if (nr < 0) {
...@@ -118,29 +117,51 @@ struct symbol *map__find_symbol(struct map *self, u64 addr, ...@@ -118,29 +117,51 @@ struct symbol *map__find_symbol(struct map *self, u64 addr,
sizeof(self->dso->build_id), sizeof(self->dso->build_id),
sbuild_id); sbuild_id);
pr_warning("%s with build id %s not found", pr_warning("%s with build id %s not found",
self->dso->long_name, sbuild_id); name, sbuild_id);
} else } else
pr_warning("Failed to open %s", pr_warning("Failed to open %s", name);
self->dso->long_name);
pr_warning(", continuing without symbols\n"); pr_warning(", continuing without symbols\n");
return NULL; return -1;
} else if (nr == 0) { } else if (nr == 0) {
const char *name = self->dso->long_name;
const size_t len = strlen(name); const size_t len = strlen(name);
const size_t real_len = len - sizeof(DSO__DELETED); const size_t real_len = len - sizeof(DSO__DELETED);
if (len > sizeof(DSO__DELETED) && if (len > sizeof(DSO__DELETED) &&
strcmp(name + real_len + 1, DSO__DELETED) == 0) { strcmp(name + real_len + 1, DSO__DELETED) == 0) {
pr_warning("%.*s was updated, restart the long running apps that use it!\n", pr_warning("%.*s was updated, restart the long "
"running apps that use it!\n",
(int)real_len, name); (int)real_len, name);
} else { } else {
pr_warning("no symbols found in %s, maybe install a debug package?\n", name); pr_warning("no symbols found in %s, maybe install "
} "a debug package?\n", name);
return NULL;
} }
return -1;
} }
return self->dso->find_symbol(self->dso, self->type, addr); return 0;
}
struct symbol *map__find_symbol(struct map *self, u64 addr,
symbol_filter_t filter)
{
if (!dso__loaded(self->dso, self->type) && map__load(self, filter) < 0)
return NULL;
return dso__find_symbol(self->dso, self->type, addr);
}
struct symbol *map__find_symbol_by_name(struct map *self, const char *name,
symbol_filter_t filter)
{
if (!dso__loaded(self->dso, self->type) && map__load(self, filter) < 0)
return NULL;
if (!dso__sorted_by_name(self->dso, self->type))
dso__sort_by_name(self->dso, self->type);
return dso__find_symbol_by_name(self->dso, self->type, name);
} }
struct map *map__clone(struct map *self) struct map *map__clone(struct map *self)
......
#include <linux/kernel.h>
#include <unistd.h>
#include <sys/types.h>
#include "session.h"
#include "util.h"
static int perf_session__open(struct perf_session *self, bool force)
{
struct stat input_stat;
self->fd = open(self->filename, O_RDONLY);
if (self->fd < 0) {
pr_err("failed to open file: %s", self->filename);
if (!strcmp(self->filename, "perf.data"))
pr_err(" (try 'perf record' first)");
pr_err("\n");
return -errno;
}
if (fstat(self->fd, &input_stat) < 0)
goto out_close;
if (!force && input_stat.st_uid && (input_stat.st_uid != geteuid())) {
pr_err("file %s not owned by current user or root\n",
self->filename);
goto out_close;
}
if (!input_stat.st_size) {
pr_info("zero-sized file (%s), nothing to do!\n",
self->filename);
goto out_close;
}
if (perf_header__read(&self->header, self->fd) < 0) {
pr_err("incompatible file format");
goto out_close;
}
self->size = input_stat.st_size;
return 0;
out_close:
close(self->fd);
self->fd = -1;
return -1;
}
struct perf_session *perf_session__new(const char *filename, int mode, bool force)
{
size_t len = strlen(filename) + 1;
struct perf_session *self = zalloc(sizeof(*self) + len);
if (self == NULL)
goto out;
if (perf_header__init(&self->header) < 0)
goto out_delete;
memcpy(self->filename, filename, len);
if (mode == O_RDONLY && perf_session__open(self, force) < 0) {
perf_session__delete(self);
self = NULL;
}
out:
return self;
out_delete:
free(self);
return NULL;
}
void perf_session__delete(struct perf_session *self)
{
perf_header__exit(&self->header);
close(self->fd);
free(self);
}
#ifndef __PERF_SESSION_H
#define __PERF_SESSION_H
#include "header.h"
struct perf_session {
struct perf_header header;
unsigned long size;
int fd;
char filename[0];
};
struct perf_session *perf_session__new(const char *filename, int mode, bool force);
void perf_session__delete(struct perf_session *self);
#endif /* __PERF_SESSION_H */
This diff is collapsed.
...@@ -52,7 +52,8 @@ struct symbol { ...@@ -52,7 +52,8 @@ struct symbol {
struct symbol_conf { struct symbol_conf {
unsigned short priv_size; unsigned short priv_size;
bool try_vmlinux_path, bool try_vmlinux_path,
use_modules; use_modules,
sort_by_name;
const char *vmlinux_name; const char *vmlinux_name;
}; };
...@@ -74,13 +75,13 @@ struct addr_location { ...@@ -74,13 +75,13 @@ struct addr_location {
struct dso { struct dso {
struct list_head node; struct list_head node;
struct rb_root symbols[MAP__NR_TYPES]; struct rb_root symbols[MAP__NR_TYPES];
struct symbol *(*find_symbol)(struct dso *self, struct rb_root symbol_names[MAP__NR_TYPES];
enum map_type type, u64 addr);
u8 adjust_symbols:1; u8 adjust_symbols:1;
u8 slen_calculated:1; u8 slen_calculated:1;
u8 has_build_id:1; u8 has_build_id:1;
u8 kernel:1; u8 kernel:1;
unsigned char origin; unsigned char origin;
u8 sorted_by_name;
u8 loaded; u8 loaded;
u8 build_id[BUILD_ID_SIZE]; u8 build_id[BUILD_ID_SIZE];
u16 long_name_len; u16 long_name_len;
...@@ -93,6 +94,9 @@ struct dso *dso__new(const char *name); ...@@ -93,6 +94,9 @@ struct dso *dso__new(const char *name);
void dso__delete(struct dso *self); void dso__delete(struct dso *self);
bool dso__loaded(const struct dso *self, enum map_type type); bool dso__loaded(const struct dso *self, enum map_type type);
bool dso__sorted_by_name(const struct dso *self, enum map_type type);
void dso__sort_by_name(struct dso *self, enum map_type type);
struct dso *dsos__findnew(const char *name); struct dso *dsos__findnew(const char *name);
int dso__load(struct dso *self, struct map *map, symbol_filter_t filter); int dso__load(struct dso *self, struct map *map, symbol_filter_t filter);
...@@ -103,6 +107,9 @@ size_t dso__fprintf_buildid(struct dso *self, FILE *fp); ...@@ -103,6 +107,9 @@ size_t dso__fprintf_buildid(struct dso *self, FILE *fp);
size_t dso__fprintf(struct dso *self, enum map_type type, FILE *fp); size_t dso__fprintf(struct dso *self, enum map_type type, FILE *fp);
char dso__symtab_origin(const struct dso *self); char dso__symtab_origin(const struct dso *self);
void dso__set_build_id(struct dso *self, void *build_id); void dso__set_build_id(struct dso *self, void *build_id);
struct symbol *dso__find_symbol(struct dso *self, enum map_type type, u64 addr);
struct symbol *dso__find_symbol_by_name(struct dso *self, enum map_type type,
const char *name);
int filename__read_build_id(const char *filename, void *bf, size_t size); int filename__read_build_id(const char *filename, void *bf, size_t size);
int sysfs__read_build_id(const char *filename, void *bf, size_t size); int sysfs__read_build_id(const char *filename, void *bf, size_t size);
...@@ -113,8 +120,8 @@ size_t kernel_maps__fprintf(FILE *fp); ...@@ -113,8 +120,8 @@ size_t kernel_maps__fprintf(FILE *fp);
int symbol__init(struct symbol_conf *conf); int symbol__init(struct symbol_conf *conf);
struct thread; struct map_groups;
struct thread *kthread; struct map_groups *kmaps;
extern struct list_head dsos__user, dsos__kernel; extern struct list_head dsos__user, dsos__kernel;
extern struct dso *vdso; extern struct dso *vdso;
#endif /* __PERF_SYMBOL */ #endif /* __PERF_SYMBOL */
...@@ -9,11 +9,9 @@ ...@@ -9,11 +9,9 @@
static struct rb_root threads; static struct rb_root threads;
static struct thread *last_match; static struct thread *last_match;
void thread__init(struct thread *self, pid_t pid) void map_groups__init(struct map_groups *self)
{ {
int i; int i;
self->pid = pid;
self->comm = NULL;
for (i = 0; i < MAP__NR_TYPES; ++i) { for (i = 0; i < MAP__NR_TYPES; ++i) {
self->maps[i] = RB_ROOT; self->maps[i] = RB_ROOT;
INIT_LIST_HEAD(&self->removed_maps[i]); INIT_LIST_HEAD(&self->removed_maps[i]);
...@@ -25,7 +23,8 @@ static struct thread *thread__new(pid_t pid) ...@@ -25,7 +23,8 @@ static struct thread *thread__new(pid_t pid)
struct thread *self = zalloc(sizeof(*self)); struct thread *self = zalloc(sizeof(*self));
if (self != NULL) { if (self != NULL) {
thread__init(self, pid); map_groups__init(&self->mg);
self->pid = pid;
self->comm = malloc(32); self->comm = malloc(32);
if (self->comm) if (self->comm)
snprintf(self->comm, 32, ":%d", self->pid); snprintf(self->comm, 32, ":%d", self->pid);
...@@ -55,9 +54,10 @@ int thread__comm_len(struct thread *self) ...@@ -55,9 +54,10 @@ int thread__comm_len(struct thread *self)
static const char *map_type__name[MAP__NR_TYPES] = { static const char *map_type__name[MAP__NR_TYPES] = {
[MAP__FUNCTION] = "Functions", [MAP__FUNCTION] = "Functions",
[MAP__VARIABLE] = "Variables",
}; };
static size_t __thread__fprintf_maps(struct thread *self, static size_t __map_groups__fprintf_maps(struct map_groups *self,
enum map_type type, FILE *fp) enum map_type type, FILE *fp)
{ {
size_t printed = fprintf(fp, "%s:\n", map_type__name[type]); size_t printed = fprintf(fp, "%s:\n", map_type__name[type]);
...@@ -76,15 +76,15 @@ static size_t __thread__fprintf_maps(struct thread *self, ...@@ -76,15 +76,15 @@ static size_t __thread__fprintf_maps(struct thread *self,
return printed; return printed;
} }
size_t thread__fprintf_maps(struct thread *self, FILE *fp) size_t map_groups__fprintf_maps(struct map_groups *self, FILE *fp)
{ {
size_t printed = 0, i; size_t printed = 0, i;
for (i = 0; i < MAP__NR_TYPES; ++i) for (i = 0; i < MAP__NR_TYPES; ++i)
printed += __thread__fprintf_maps(self, i, fp); printed += __map_groups__fprintf_maps(self, i, fp);
return printed; return printed;
} }
static size_t __thread__fprintf_removed_maps(struct thread *self, static size_t __map_groups__fprintf_removed_maps(struct map_groups *self,
enum map_type type, FILE *fp) enum map_type type, FILE *fp)
{ {
struct map *pos; struct map *pos;
...@@ -101,20 +101,25 @@ static size_t __thread__fprintf_removed_maps(struct thread *self, ...@@ -101,20 +101,25 @@ static size_t __thread__fprintf_removed_maps(struct thread *self,
return printed; return printed;
} }
static size_t thread__fprintf_removed_maps(struct thread *self, FILE *fp) static size_t map_groups__fprintf_removed_maps(struct map_groups *self, FILE *fp)
{ {
size_t printed = 0, i; size_t printed = 0, i;
for (i = 0; i < MAP__NR_TYPES; ++i) for (i = 0; i < MAP__NR_TYPES; ++i)
printed += __thread__fprintf_removed_maps(self, i, fp); printed += __map_groups__fprintf_removed_maps(self, i, fp);
return printed; return printed;
} }
static size_t thread__fprintf(struct thread *self, FILE *fp) static size_t map_groups__fprintf(struct map_groups *self, FILE *fp)
{ {
size_t printed = fprintf(fp, "Thread %d %s\n", self->pid, self->comm); size_t printed = map_groups__fprintf_maps(self, fp);
printed += thread__fprintf_removed_maps(self, fp);
printed += fprintf(fp, "Removed maps:\n"); printed += fprintf(fp, "Removed maps:\n");
return printed + thread__fprintf_removed_maps(self, fp); return printed + map_groups__fprintf_removed_maps(self, fp);
}
static size_t thread__fprintf(struct thread *self, FILE *fp)
{
return fprintf(fp, "Thread %d %s\n", self->pid, self->comm) +
map_groups__fprintf(&self->mg, fp);
} }
struct thread *threads__findnew(pid_t pid) struct thread *threads__findnew(pid_t pid)
...@@ -168,7 +173,8 @@ struct thread *register_idle_thread(void) ...@@ -168,7 +173,8 @@ struct thread *register_idle_thread(void)
return thread; return thread;
} }
static void thread__remove_overlappings(struct thread *self, struct map *map) static void map_groups__remove_overlappings(struct map_groups *self,
struct map *map)
{ {
struct rb_root *root = &self->maps[map->type]; struct rb_root *root = &self->maps[map->type];
struct rb_node *next = rb_first(root); struct rb_node *next = rb_first(root);
...@@ -238,12 +244,15 @@ struct map *maps__find(struct rb_root *maps, u64 ip) ...@@ -238,12 +244,15 @@ struct map *maps__find(struct rb_root *maps, u64 ip)
void thread__insert_map(struct thread *self, struct map *map) void thread__insert_map(struct thread *self, struct map *map)
{ {
thread__remove_overlappings(self, map); map_groups__remove_overlappings(&self->mg, map);
maps__insert(&self->maps[map->type], map); map_groups__insert(&self->mg, map);
} }
static int thread__clone_maps(struct thread *self, struct thread *parent, /*
enum map_type type) * XXX This should not really _copy_ te maps, but refcount them.
*/
static int map_groups__clone(struct map_groups *self,
struct map_groups *parent, enum map_type type)
{ {
struct rb_node *nd; struct rb_node *nd;
for (nd = rb_first(&parent->maps[type]); nd; nd = rb_next(nd)) { for (nd = rb_first(&parent->maps[type]); nd; nd = rb_next(nd)) {
...@@ -251,7 +260,7 @@ static int thread__clone_maps(struct thread *self, struct thread *parent, ...@@ -251,7 +260,7 @@ static int thread__clone_maps(struct thread *self, struct thread *parent,
struct map *new = map__clone(map); struct map *new = map__clone(map);
if (new == NULL) if (new == NULL)
return -ENOMEM; return -ENOMEM;
thread__insert_map(self, new); map_groups__insert(self, new);
} }
return 0; return 0;
} }
...@@ -267,7 +276,7 @@ int thread__fork(struct thread *self, struct thread *parent) ...@@ -267,7 +276,7 @@ int thread__fork(struct thread *self, struct thread *parent)
return -ENOMEM; return -ENOMEM;
for (i = 0; i < MAP__NR_TYPES; ++i) for (i = 0; i < MAP__NR_TYPES; ++i)
if (thread__clone_maps(self, parent, i) < 0) if (map_groups__clone(&self->mg, &parent->mg, i) < 0)
return -ENOMEM; return -ENOMEM;
return 0; return 0;
} }
...@@ -286,11 +295,11 @@ size_t threads__fprintf(FILE *fp) ...@@ -286,11 +295,11 @@ size_t threads__fprintf(FILE *fp)
return ret; return ret;
} }
struct symbol *thread__find_symbol(struct thread *self, struct symbol *map_groups__find_symbol(struct map_groups *self,
enum map_type type, u64 addr, enum map_type type, u64 addr,
symbol_filter_t filter) symbol_filter_t filter)
{ {
struct map *map = thread__find_map(self, type, addr); struct map *map = map_groups__find(self, type, addr);
if (map != NULL) if (map != NULL)
return map__find_symbol(map, map->map_ip(map, addr), filter); return map__find_symbol(map, map->map_ip(map, addr), filter);
......
...@@ -5,52 +5,66 @@ ...@@ -5,52 +5,66 @@
#include <unistd.h> #include <unistd.h>
#include "symbol.h" #include "symbol.h"
struct thread { struct map_groups {
struct rb_node rb_node;
struct rb_root maps[MAP__NR_TYPES]; struct rb_root maps[MAP__NR_TYPES];
struct list_head removed_maps[MAP__NR_TYPES]; struct list_head removed_maps[MAP__NR_TYPES];
pid_t pid;
bool use_modules; bool use_modules;
};
struct thread {
struct rb_node rb_node;
struct map_groups mg;
pid_t pid;
char shortname[3]; char shortname[3];
char *comm; char *comm;
int comm_len; int comm_len;
}; };
void thread__init(struct thread *self, pid_t pid); void map_groups__init(struct map_groups *self);
int thread__set_comm(struct thread *self, const char *comm); int thread__set_comm(struct thread *self, const char *comm);
int thread__comm_len(struct thread *self); int thread__comm_len(struct thread *self);
struct thread *threads__findnew(pid_t pid); struct thread *threads__findnew(pid_t pid);
struct thread *register_idle_thread(void); struct thread *register_idle_thread(void);
void thread__insert_map(struct thread *self, struct map *map); void thread__insert_map(struct thread *self, struct map *map);
int thread__fork(struct thread *self, struct thread *parent); int thread__fork(struct thread *self, struct thread *parent);
size_t thread__fprintf_maps(struct thread *self, FILE *fp); size_t map_groups__fprintf_maps(struct map_groups *self, FILE *fp);
size_t threads__fprintf(FILE *fp); size_t threads__fprintf(FILE *fp);
void maps__insert(struct rb_root *maps, struct map *map); void maps__insert(struct rb_root *maps, struct map *map);
struct map *maps__find(struct rb_root *maps, u64 addr); struct map *maps__find(struct rb_root *maps, u64 addr);
static inline struct map *thread__find_map(struct thread *self, static inline void map_groups__insert(struct map_groups *self, struct map *map)
{
maps__insert(&self->maps[map->type], map);
}
static inline struct map *map_groups__find(struct map_groups *self,
enum map_type type, u64 addr) enum map_type type, u64 addr)
{ {
return self ? maps__find(&self->maps[type], addr) : NULL; return maps__find(&self->maps[type], addr);
} }
static inline void __thread__insert_map(struct thread *self, struct map *map) static inline struct map *thread__find_map(struct thread *self,
enum map_type type, u64 addr)
{ {
maps__insert(&self->maps[map->type], map); return self ? map_groups__find(&self->mg, type, addr) : NULL;
} }
void thread__find_addr_location(struct thread *self, u8 cpumode, void thread__find_addr_location(struct thread *self, u8 cpumode,
enum map_type type, u64 addr, enum map_type type, u64 addr,
struct addr_location *al, struct addr_location *al,
symbol_filter_t filter); symbol_filter_t filter);
struct symbol *thread__find_symbol(struct thread *self, struct symbol *map_groups__find_symbol(struct map_groups *self,
enum map_type type, u64 addr, enum map_type type, u64 addr,
symbol_filter_t filter); symbol_filter_t filter);
static inline struct symbol * static inline struct symbol *
thread__find_function(struct thread *self, u64 addr, symbol_filter_t filter) map_groups__find_function(struct map_groups *self, u64 addr,
symbol_filter_t filter)
{ {
return thread__find_symbol(self, MAP__FUNCTION, addr, filter); return map_groups__find_symbol(self, MAP__FUNCTION, addr, filter);
} }
struct map *map_groups__find_by_name(struct map_groups *self,
enum map_type type, const char *name);
#endif /* __PERF_THREAD_H */ #endif /* __PERF_THREAD_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment