iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf probe: Export init/exit_probe_symbol_maps()

Browse Source 
The init/exit_symbols_maps() functions are to setup and cleanup
necessary info for probe events.  But they need to be called from out of
the probe code now, so this patch exports them.

However the names are too generic, so change them to have 'probe'. :)

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1441852026-28974-2-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Namhyung Kim 2015-09-10 11:27:05 +09:00 committed by Arnaldo Carvalho de Melo
parent a43aac299c
commit 9bae1e8c3f
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/perf/builtin-probe.c
View File

@ -317,6 +317,10 @@ static int perf_add_probe_events(struct perf_probe_event *pevs, int npevs)
int i, k; int i, k;
const char *event = NULL, *group = NULL; const char *event = NULL, *group = NULL;
ret = init_probe_symbol_maps(pevs->uprobes);
if (ret < 0)
return ret;
ret = convert_perf_probe_events(pevs, npevs); ret = convert_perf_probe_events(pevs, npevs);
if (ret < 0) if (ret < 0)
goto out_cleanup; goto out_cleanup;
@ -354,6 +358,7 @@ static int perf_add_probe_events(struct perf_probe_event *pevs, int npevs)
out_cleanup: out_cleanup:
cleanup_perf_probe_events(pevs, npevs); cleanup_perf_probe_events(pevs, npevs);
exit_probe_symbol_maps();
return ret; return ret;
} }

31
tools/perf/util/probe-event.c
View File

@ -71,7 +71,7 @@ static char *synthesize_perf_probe_point(struct perf_probe_point *pp);
static struct machine *host_machine; static struct machine *host_machine;
/* Initialize symbol maps and path of vmlinux/modules */ /* Initialize symbol maps and path of vmlinux/modules */
static int init_symbol_maps(bool user_only) int init_probe_symbol_maps(bool user_only)
{ {
int ret; int ret;
@ -101,7 +101,7 @@ out:
return ret; return ret;
} }
static void exit_symbol_maps(void) void exit_probe_symbol_maps(void)
{ {
if (host_machine) { if (host_machine) {
machine__delete(host_machine); machine__delete(host_machine);
@ -859,11 +859,11 @@ int show_line_range(struct line_range *lr, const char *module, bool user)
{ {
int ret; int ret;
ret = init_symbol_maps(user); ret = init_probe_symbol_maps(user);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = __show_line_range(lr, module, user); ret = __show_line_range(lr, module, user);
exit_symbol_maps(); exit_probe_symbol_maps();
return ret; return ret;
} }
@ -941,7 +941,7 @@ int show_available_vars(struct perf_probe_event *pevs, int npevs,
int i, ret = 0; int i, ret = 0;
struct debuginfo *dinfo; struct debuginfo *dinfo;
ret = init_symbol_maps(pevs->uprobes); ret = init_probe_symbol_maps(pevs->uprobes);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -958,7 +958,7 @@ int show_available_vars(struct perf_probe_event *pevs, int npevs,
debuginfo__delete(dinfo); debuginfo__delete(dinfo);
out: out:
exit_symbol_maps(); exit_probe_symbol_maps();
return ret; return ret;
} }
@ -2262,7 +2262,7 @@ int show_perf_probe_events(struct strfilter *filter)
setup_pager(); setup_pager();
ret = init_symbol_maps(false); ret = init_probe_symbol_maps(false);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -2278,7 +2278,7 @@ int show_perf_probe_events(struct strfilter *filter)
close(kp_fd); close(kp_fd);
if (up_fd > 0) if (up_fd > 0)
close(up_fd); close(up_fd);
exit_symbol_maps(); exit_probe_symbol_maps();
return ret; return ret;
} }
@ -2746,10 +2746,6 @@ int convert_perf_probe_events(struct perf_probe_event *pevs, int npevs)
{ {
int i, ret; int i, ret;
ret = init_symbol_maps(pevs->uprobes);
if (ret < 0)
return ret;
/* Loop 1: convert all events */ /* Loop 1: convert all events */
for (i = 0; i < npevs; i++) { for (i = 0; i < npevs; i++) {
/* Init kprobe blacklist if needed */ /* Init kprobe blacklist if needed */
@ -2794,20 +2790,23 @@ void cleanup_perf_probe_events(struct perf_probe_event *pevs, int npevs)
pevs[i].ntevs = 0; pevs[i].ntevs = 0;
clear_perf_probe_event(&pevs[i]); clear_perf_probe_event(&pevs[i]);
} }
exit_symbol_maps();
} }
int add_perf_probe_events(struct perf_probe_event *pevs, int npevs) int add_perf_probe_events(struct perf_probe_event *pevs, int npevs)
{ {
int ret; int ret;
ret = init_probe_symbol_maps(pevs->uprobes);
if (ret < 0)
return ret;
ret = convert_perf_probe_events(pevs, npevs); ret = convert_perf_probe_events(pevs, npevs);
if (ret == 0) if (ret == 0)
ret = apply_perf_probe_events(pevs, npevs); ret = apply_perf_probe_events(pevs, npevs);
cleanup_perf_probe_events(pevs, npevs); cleanup_perf_probe_events(pevs, npevs);
exit_probe_symbol_maps();
return ret; return ret;
} }
@ -2867,7 +2866,7 @@ int show_available_funcs(const char *target, struct strfilter *_filter,
struct map *map; struct map *map;
int ret; int ret;
ret = init_symbol_maps(user); ret = init_probe_symbol_maps(user);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -2897,7 +2896,7 @@ end:
if (user) { if (user) {
map__put(map); map__put(map);
} }
exit_symbol_maps(); exit_probe_symbol_maps();
return ret; return ret;
} }

2
tools/perf/util/probe-event.h
View File

@ -110,6 +110,8 @@ struct variable_list {
}; };
struct map; struct map;
int init_probe_symbol_maps(bool user_only);
void exit_probe_symbol_maps(void);
/* Command string to events */ /* Command string to events */
extern int parse_perf_probe_command(const char *cmd, extern int parse_perf_probe_command(const char *cmd,