diff options
| author | Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> | 2010-10-21 19:13:35 +0900 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2010-10-21 16:06:42 -0200 |
| commit | fb8c5a56c7ddbc2b0d2ee7a8da60fe1355f75141 (patch) | |
| tree | 0d7575627d9fbcdeb642fbcb6ed84744fe9763f5 /tools/perf/util/probe-finder.c | |
| parent | c82ec0a2bd7725a2d2ac3065d8cde13e1f717d3c (diff) | |
| download | linux-fb8c5a56c7ddbc2b0d2ee7a8da60fe1355f75141.tar.bz2 | |
perf probe: Show accessible global variables
Add --externs for allowing --vars to show accessible global (externally
defined) variables from a given probe point too.
This will give you a hint which globals can be accessible from the probe point.
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <20101021101335.3542.31003.stgit@ltc236.sdl.hitachi.co.jp>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/probe-finder.c')
| -rw-r--r-- | tools/perf/util/probe-finder.c | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c index 986027fa495f..a274fd0c143e 100644 --- a/tools/perf/util/probe-finder.c +++ b/tools/perf/util/probe-finder.c @@ -1312,12 +1312,13 @@ static int collect_variables_cb(Dwarf_Die *die_mem, void *data) af->pf.fb_ops, NULL); if (ret == 0) { ret = die_get_varname(die_mem, buf, MAX_VAR_LEN); + pr_debug2("Add new var: %s\n", buf); if (ret > 0) strlist__add(vl->vars, buf); } } - if (dwarf_haspc(die_mem, af->pf.addr)) + if (af->child && dwarf_haspc(die_mem, af->pf.addr)) return DIE_FIND_CB_CONTINUE; else return DIE_FIND_CB_SIBLING; @@ -1329,8 +1330,8 @@ static int add_available_vars(Dwarf_Die *sp_die, struct probe_finder *pf) struct available_var_finder *af = container_of(pf, struct available_var_finder, pf); struct variable_list *vl; - Dwarf_Die die_mem; - int ret; + Dwarf_Die die_mem, *scopes = NULL; + int ret, nscopes; /* Check number of tevs */ if (af->nvls == af->max_vls) { @@ -1351,8 +1352,22 @@ static int add_available_vars(Dwarf_Die *sp_die, struct probe_finder *pf) vl->vars = strlist__new(true, NULL); if (vl->vars == NULL) return -ENOMEM; + af->child = true; die_find_child(sp_die, collect_variables_cb, (void *)af, &die_mem); + /* Find external variables */ + if (!af->externs) + goto out; + /* Don't need to search child DIE for externs. */ + af->child = false; + nscopes = dwarf_getscopes_die(sp_die, &scopes); + while (nscopes-- > 1) + die_find_child(&scopes[nscopes], collect_variables_cb, + (void *)af, &die_mem); + if (scopes) + free(scopes); + +out: if (strlist__empty(vl->vars)) { strlist__delete(vl->vars); vl->vars = NULL; @@ -1363,11 +1378,12 @@ static int add_available_vars(Dwarf_Die *sp_die, struct probe_finder *pf) /* Find available variables at given probe point */ int find_available_vars_at(int fd, struct perf_probe_event *pev, - struct variable_list **vls, int max_vls) + struct variable_list **vls, int max_vls, + bool externs) { struct available_var_finder af = { .pf = {.pev = pev, .callback = add_available_vars}, - .max_vls = max_vls}; + .max_vls = max_vls, .externs = externs}; int ret; /* Allocate result vls array */ |