Commit 4235b045 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Ingo Molnar

perf probe: Introduce kprobe_trace_event and perf_probe_event

Introduce kprobe_trace_event and perf_probe_event and replace
old probe_point structure with it. probe_point structure is
not enough flexible nor extensible. New data structures
will help implementing further features.
Signed-off-by: default avatarMasami Hiramatsu <mhiramat@redhat.com>
Cc: systemtap <systemtap@sources.redhat.com>
Cc: DLE <dle-develop@lists.sourceforge.net>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20100316220612.32050.33806.stgit@localhost6.localdomain6>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f4d7da49
...@@ -48,12 +48,11 @@ ...@@ -48,12 +48,11 @@
/* Session management structure */ /* Session management structure */
static struct { static struct {
bool need_dwarf;
bool list_events; bool list_events;
bool force_add; bool force_add;
bool show_lines; bool show_lines;
int nr_probe; int nevents;
struct probe_point probes[MAX_PROBES]; struct perf_probe_event events[MAX_PROBES];
struct strlist *dellist; struct strlist *dellist;
struct line_range line_range; struct line_range line_range;
} params; } params;
...@@ -62,16 +61,16 @@ static struct { ...@@ -62,16 +61,16 @@ static struct {
/* Parse an event definition. Note that any error must die. */ /* Parse an event definition. Note that any error must die. */
static void parse_probe_event(const char *str) static void parse_probe_event(const char *str)
{ {
struct probe_point *pp = &params.probes[params.nr_probe]; struct perf_probe_event *pev = &params.events[params.nevents];
pr_debug("probe-definition(%d): %s\n", params.nr_probe, str); pr_debug("probe-definition(%d): %s\n", params.nevents, str);
if (++params.nr_probe == MAX_PROBES) if (++params.nevents == MAX_PROBES)
die("Too many probes (> %d) are specified.", MAX_PROBES); die("Too many probes (> %d) are specified.", MAX_PROBES);
/* Parse perf-probe event into probe_point */ /* Parse a perf-probe command into event */
parse_perf_probe_event(str, pp, &params.need_dwarf); parse_perf_probe_command(str, pev);
pr_debug("%d arguments\n", pp->nr_args); pr_debug("%d arguments\n", pev->nargs);
} }
static void parse_probe_event_argv(int argc, const char **argv) static void parse_probe_event_argv(int argc, const char **argv)
...@@ -191,7 +190,7 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used) ...@@ -191,7 +190,7 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
parse_probe_event_argv(argc, argv); parse_probe_event_argv(argc, argv);
} }
if ((!params.nr_probe && !params.dellist && !params.list_events && if ((!params.nevents && !params.dellist && !params.list_events &&
!params.show_lines)) !params.show_lines))
usage_with_options(probe_usage, options); usage_with_options(probe_usage, options);
...@@ -199,7 +198,7 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used) ...@@ -199,7 +198,7 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
die("Failed to find debugfs path."); die("Failed to find debugfs path.");
if (params.list_events) { if (params.list_events) {
if (params.nr_probe != 0 || params.dellist) { if (params.nevents != 0 || params.dellist) {
pr_warning(" Error: Don't use --list with" pr_warning(" Error: Don't use --list with"
" --add/--del.\n"); " --add/--del.\n");
usage_with_options(probe_usage, options); usage_with_options(probe_usage, options);
...@@ -214,7 +213,7 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used) ...@@ -214,7 +213,7 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
#ifndef NO_DWARF_SUPPORT #ifndef NO_DWARF_SUPPORT
if (params.show_lines) { if (params.show_lines) {
if (params.nr_probe != 0 || params.dellist) { if (params.nevents != 0 || params.dellist) {
pr_warning(" Error: Don't use --line with" pr_warning(" Error: Don't use --line with"
" --add/--del.\n"); " --add/--del.\n");
usage_with_options(probe_usage, options); usage_with_options(probe_usage, options);
...@@ -226,14 +225,13 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used) ...@@ -226,14 +225,13 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
#endif #endif
if (params.dellist) { if (params.dellist) {
del_trace_kprobe_events(params.dellist); del_perf_probe_events(params.dellist);
strlist__delete(params.dellist); strlist__delete(params.dellist);
if (params.nr_probe == 0) if (params.nevents == 0)
return 0; return 0;
} }
add_trace_kprobe_events(params.probes, params.nr_probe, add_perf_probe_events(params.events, params.nevents, params.force_add);
params.force_add, params.need_dwarf);
return 0; return 0;
} }
This diff is collapsed.
...@@ -2,24 +2,113 @@ ...@@ -2,24 +2,113 @@
#define _PROBE_EVENT_H #define _PROBE_EVENT_H
#include <stdbool.h> #include <stdbool.h>
#include "probe-finder.h"
#include "strlist.h" #include "strlist.h"
extern bool probe_event_dry_run; extern bool probe_event_dry_run;
extern void parse_line_range_desc(const char *arg, struct line_range *lr); /* kprobe-tracer tracing point */
extern void parse_perf_probe_event(const char *str, struct probe_point *pp, struct kprobe_trace_point {
bool *need_dwarf); char *symbol; /* Base symbol */
extern int synthesize_perf_probe_point(struct probe_point *pp); unsigned long offset; /* Offset from symbol */
extern int synthesize_perf_probe_event(struct probe_point *pp); bool retprobe; /* Return probe flag */
extern void parse_trace_kprobe_event(const char *str, struct probe_point *pp); };
extern int synthesize_trace_kprobe_event(struct probe_point *pp);
extern void add_trace_kprobe_events(struct probe_point *probes, int nr_probes, /* kprobe-tracer tracing argument referencing offset */
bool force_add, bool need_dwarf); struct kprobe_trace_arg_ref {
extern void del_trace_kprobe_events(struct strlist *dellist); struct kprobe_trace_arg_ref *next; /* Next reference */
long offset; /* Offset value */
};
/* kprobe-tracer tracing argument */
struct kprobe_trace_arg {
char *name; /* Argument name */
char *value; /* Base value */
struct kprobe_trace_arg_ref *ref; /* Referencing offset */
};
/* kprobe-tracer tracing event (point + arg) */
struct kprobe_trace_event {
char *event; /* Event name */
char *group; /* Group name */
struct kprobe_trace_point point; /* Trace point */
int nargs; /* Number of args */
struct kprobe_trace_arg *args; /* Arguments */
};
/* Perf probe probing point */
struct perf_probe_point {
char *file; /* File path */
char *function; /* Function name */
int line; /* Line number */
char *lazy_line; /* Lazy matching pattern */
unsigned long offset; /* Offset from function entry */
bool retprobe; /* Return probe flag */
};
/* Perf probe probing argument */
struct perf_probe_arg {
char *name; /* Argument name */
};
/* Perf probe probing event (point + arg) */
struct perf_probe_event {
char *event; /* Event name */
char *group; /* Group name */
struct perf_probe_point point; /* Probe point */
int nargs; /* Number of arguments */
struct perf_probe_arg *args; /* Arguments */
};
/* Line number container */
struct line_node {
struct list_head list;
unsigned int line;
};
/* Line range */
struct line_range {
char *file; /* File name */
char *function; /* Function name */
unsigned int start; /* Start line number */
unsigned int end; /* End line number */
int offset; /* Start line offset */
char *path; /* Real path name */
struct list_head line_list; /* Visible lines */
};
/* Command string to events */
extern void parse_perf_probe_command(const char *cmd,
struct perf_probe_event *pev);
extern void parse_kprobe_trace_command(const char *cmd,
struct kprobe_trace_event *tev);
/* Events to command string */
extern char *synthesize_perf_probe_command(struct perf_probe_event *pev);
extern char *synthesize_kprobe_trace_command(struct kprobe_trace_event *tev);
/* Check the perf_probe_event needs debuginfo */
extern bool perf_probe_event_need_dwarf(struct perf_probe_event *pev);
/* Convert from kprobe_trace_event to perf_probe_event */
extern void convert_to_perf_probe_event(struct kprobe_trace_event *tev,
struct perf_probe_event *pev);
/* Release event contents */
extern void clear_perf_probe_event(struct perf_probe_event *pev);
extern void clear_kprobe_trace_event(struct kprobe_trace_event *tev);
/* Command string to line-range */
extern void parse_line_range_desc(const char *cmd, struct line_range *lr);
extern void add_perf_probe_events(struct perf_probe_event *pevs, int ntevs,
bool force_add);
extern void del_perf_probe_events(struct strlist *dellist);
extern void show_perf_probe_events(void); extern void show_perf_probe_events(void);
extern void show_line_range(struct line_range *lr); extern void show_line_range(struct line_range *lr);
/* Maximum index number of event-name postfix */ /* Maximum index number of event-name postfix */
#define MAX_EVENT_INDEX 1024 #define MAX_EVENT_INDEX 1024
......
...@@ -319,19 +319,20 @@ static Dwarf_Die *die_find_variable(Dwarf_Die *sp_die, const char *name, ...@@ -319,19 +319,20 @@ static Dwarf_Die *die_find_variable(Dwarf_Die *sp_die, const char *name,
*/ */
/* Show a location */ /* Show a location */
static void show_location(Dwarf_Op *op, struct probe_finder *pf) static void convert_location(Dwarf_Op *op, struct probe_finder *pf)
{ {
unsigned int regn; unsigned int regn;
Dwarf_Word offs = 0; Dwarf_Word offs = 0;
int deref = 0, ret; bool ref = false;
const char *regs; const char *regs;
struct kprobe_trace_arg *tvar = pf->tvar;
/* TODO: support CFA */ /* TODO: support CFA */
/* If this is based on frame buffer, set the offset */ /* If this is based on frame buffer, set the offset */
if (op->atom == DW_OP_fbreg) { if (op->atom == DW_OP_fbreg) {
if (pf->fb_ops == NULL) if (pf->fb_ops == NULL)
die("The attribute of frame base is not supported.\n"); die("The attribute of frame base is not supported.\n");
deref = 1; ref = true;
offs = op->number; offs = op->number;
op = &pf->fb_ops[0]; op = &pf->fb_ops[0];
} }
...@@ -339,13 +340,13 @@ static void show_location(Dwarf_Op *op, struct probe_finder *pf) ...@@ -339,13 +340,13 @@ static void show_location(Dwarf_Op *op, struct probe_finder *pf)
if (op->atom >= DW_OP_breg0 && op->atom <= DW_OP_breg31) { if (op->atom >= DW_OP_breg0 && op->atom <= DW_OP_breg31) {
regn = op->atom - DW_OP_breg0; regn = op->atom - DW_OP_breg0;
offs += op->number; offs += op->number;
deref = 1; ref = true;
} else if (op->atom >= DW_OP_reg0 && op->atom <= DW_OP_reg31) { } else if (op->atom >= DW_OP_reg0 && op->atom <= DW_OP_reg31) {
regn = op->atom - DW_OP_reg0; regn = op->atom - DW_OP_reg0;
} else if (op->atom == DW_OP_bregx) { } else if (op->atom == DW_OP_bregx) {
regn = op->number; regn = op->number;
offs += op->number2; offs += op->number2;
deref = 1; ref = true;
} else if (op->atom == DW_OP_regx) { } else if (op->atom == DW_OP_regx) {
regn = op->number; regn = op->number;
} else } else
...@@ -355,17 +356,15 @@ static void show_location(Dwarf_Op *op, struct probe_finder *pf) ...@@ -355,17 +356,15 @@ static void show_location(Dwarf_Op *op, struct probe_finder *pf)
if (!regs) if (!regs)
die("%u exceeds max register number.", regn); die("%u exceeds max register number.", regn);
if (deref) tvar->value = xstrdup(regs);
ret = snprintf(pf->buf, pf->len, " %s=%+jd(%s)", if (ref) {
pf->var, (intmax_t)offs, regs); tvar->ref = xzalloc(sizeof(struct kprobe_trace_arg_ref));
else tvar->ref->offset = (long)offs;
ret = snprintf(pf->buf, pf->len, " %s=%s", pf->var, regs); }
DIE_IF(ret < 0);
DIE_IF(ret >= pf->len);
} }
/* Show a variables in kprobe event format */ /* Show a variables in kprobe event format */
static void show_variable(Dwarf_Die *vr_die, struct probe_finder *pf) static void convert_variable(Dwarf_Die *vr_die, struct probe_finder *pf)
{ {
Dwarf_Attribute attr; Dwarf_Attribute attr;
Dwarf_Op *expr; Dwarf_Op *expr;
...@@ -379,50 +378,51 @@ static void show_variable(Dwarf_Die *vr_die, struct probe_finder *pf) ...@@ -379,50 +378,51 @@ static void show_variable(Dwarf_Die *vr_die, struct probe_finder *pf)
if (ret <= 0 || nexpr == 0) if (ret <= 0 || nexpr == 0)
goto error; goto error;
show_location(expr, pf); convert_location(expr, pf);
/* *expr will be cached in libdw. Don't free it. */ /* *expr will be cached in libdw. Don't free it. */
return ; return ;
error: error:
/* TODO: Support const_value */ /* TODO: Support const_value */
die("Failed to find the location of %s at this address.\n" die("Failed to find the location of %s at this address.\n"
" Perhaps, it has been optimized out.", pf->var); " Perhaps, it has been optimized out.", pf->pvar->name);
} }
/* Find a variable in a subprogram die */ /* Find a variable in a subprogram die */
static void find_variable(Dwarf_Die *sp_die, struct probe_finder *pf) static void find_variable(Dwarf_Die *sp_die, struct probe_finder *pf)
{ {
int ret;
Dwarf_Die vr_die; Dwarf_Die vr_die;
/* TODO: Support struct members and arrays */ /* TODO: Support struct members and arrays */
if (!is_c_varname(pf->var)) { if (!is_c_varname(pf->pvar->name)) {
/* Output raw parameters */ /* Copy raw parameters */
ret = snprintf(pf->buf, pf->len, " %s", pf->var); pf->tvar->value = xstrdup(pf->pvar->name);
DIE_IF(ret < 0); } else {
DIE_IF(ret >= pf->len); pf->tvar->name = xstrdup(pf->pvar->name);
return ; pr_debug("Searching '%s' variable in context.\n",
} pf->pvar->name);
pr_debug("Searching '%s' variable in context.\n", pf->var);
/* Search child die for local variables and parameters. */ /* Search child die for local variables and parameters. */
if (!die_find_variable(sp_die, pf->var, &vr_die)) if (!die_find_variable(sp_die, pf->pvar->name, &vr_die))
die("Failed to find '%s' in this function.", pf->var); die("Failed to find '%s' in this function.",
pf->pvar->name);
show_variable(&vr_die, pf); convert_variable(&vr_die, pf);
}
} }
/* Show a probe point to output buffer */ /* Show a probe point to output buffer */
static void show_probe_point(Dwarf_Die *sp_die, struct probe_finder *pf) static void convert_probe_point(Dwarf_Die *sp_die, struct probe_finder *pf)
{ {
struct probe_point *pp = pf->pp; struct kprobe_trace_event *tev;
Dwarf_Addr eaddr; Dwarf_Addr eaddr;
Dwarf_Die die_mem; Dwarf_Die die_mem;
const char *name; const char *name;
char tmp[MAX_PROBE_BUFFER]; int ret, i;
int ret, i, len;
Dwarf_Attribute fb_attr; Dwarf_Attribute fb_attr;
size_t nops; size_t nops;
if (pf->ntevs == MAX_PROBES)
die("Too many( > %d) probe point found.\n", MAX_PROBES);
tev = &pf->tevs[pf->ntevs++];
/* If no real subprogram, find a real one */ /* If no real subprogram, find a real one */
if (!sp_die || dwarf_tag(sp_die) != DW_TAG_subprogram) { if (!sp_die || dwarf_tag(sp_die) != DW_TAG_subprogram) {
sp_die = die_find_real_subprogram(&pf->cu_die, sp_die = die_find_real_subprogram(&pf->cu_die,
...@@ -431,31 +431,18 @@ static void show_probe_point(Dwarf_Die *sp_die, struct probe_finder *pf) ...@@ -431,31 +431,18 @@ static void show_probe_point(Dwarf_Die *sp_die, struct probe_finder *pf)
die("Probe point is not found in subprograms."); die("Probe point is not found in subprograms.");
} }
/* Output name of probe point */ /* Copy the name of probe point */
name = dwarf_diename(sp_die); name = dwarf_diename(sp_die);
if (name) { if (name) {
dwarf_entrypc(sp_die, &eaddr); dwarf_entrypc(sp_die, &eaddr);
ret = snprintf(tmp, MAX_PROBE_BUFFER, "%s+%lu", name, tev->point.symbol = xstrdup(name);
(unsigned long)(pf->addr - eaddr)); tev->point.offset = (unsigned long)(pf->addr - eaddr);
/* Copy the function name if possible */ } else
if (!pp->function) {
pp->function = xstrdup(name);
pp->offset = (size_t)(pf->addr - eaddr);
}
} else {
/* This function has no name. */ /* This function has no name. */
ret = snprintf(tmp, MAX_PROBE_BUFFER, "0x%jx", tev->point.offset = (unsigned long)pf->addr;
(uintmax_t)pf->addr);
if (!pp->function) { pr_debug("Probe point found: %s+%lu\n", tev->point.symbol,
/* TODO: Use _stext */ tev->point.offset);
pp->function = xstrdup("");
pp->offset = (size_t)pf->addr;
}
}
DIE_IF(ret < 0);
DIE_IF(ret >= MAX_PROBE_BUFFER);
len = ret;
pr_debug("Probe point found: %s\n", tmp);
/* Get the frame base attribute/ops */ /* Get the frame base attribute/ops */
dwarf_attr(sp_die, DW_AT_frame_base, &fb_attr); dwarf_attr(sp_die, DW_AT_frame_base, &fb_attr);
...@@ -465,22 +452,16 @@ static void show_probe_point(Dwarf_Die *sp_die, struct probe_finder *pf) ...@@ -465,22 +452,16 @@ static void show_probe_point(Dwarf_Die *sp_die, struct probe_finder *pf)
/* Find each argument */ /* Find each argument */
/* TODO: use dwarf_cfi_addrframe */ /* TODO: use dwarf_cfi_addrframe */
for (i = 0; i < pp->nr_args; i++) { tev->nargs = pf->pev->nargs;
pf->var = pp->args[i]; tev->args = xzalloc(sizeof(struct kprobe_trace_arg) * tev->nargs);
pf->buf = &tmp[len]; for (i = 0; i < pf->pev->nargs; i++) {
pf->len = MAX_PROBE_BUFFER - len; pf->pvar = &pf->pev->args[i];
pf->tvar = &tev->args[i];
find_variable(sp_die, pf); find_variable(sp_die, pf);
len += strlen(pf->buf);
} }
/* *pf->fb_ops will be cached in libdw. Don't free it. */ /* *pf->fb_ops will be cached in libdw. Don't free it. */
pf->fb_ops = NULL; pf->fb_ops = NULL;
if (pp->found == MAX_PROBES)
die("Too many( > %d) probe point found.\n", MAX_PROBES);
pp->probes[pp->found] = xstrdup(tmp);
pp->found++;
} }
/* Find probe point from its line number */ /* Find probe point from its line number */
...@@ -512,7 +493,7 @@ static void find_probe_point_by_line(struct probe_finder *pf) ...@@ -512,7 +493,7 @@ static void find_probe_point_by_line(struct probe_finder *pf)
(int)i, lineno, (uintmax_t)addr); (int)i, lineno, (uintmax_t)addr);
pf->addr = addr; pf->addr = addr;
show_probe_point(NULL, pf); convert_probe_point(NULL, pf);
/* Continuing, because target line might be inlined. */ /* Continuing, because target line might be inlined. */
} }
} }
...@@ -563,7 +544,7 @@ static void find_probe_point_lazy(Dwarf_Die *sp_die, struct probe_finder *pf) ...@@ -563,7 +544,7 @@ static void find_probe_point_lazy(Dwarf_Die *sp_die, struct probe_finder *pf)
if (list_empty(&pf->lcache)) { if (list_empty(&pf->lcache)) {
/* Matching lazy line pattern */ /* Matching lazy line pattern */
ret = find_lazy_match_lines(&pf->lcache, pf->fname, ret = find_lazy_match_lines(&pf->lcache, pf->fname,
pf->pp->lazy_line); pf->pev->point.lazy_line);
if (ret <= 0) if (ret <= 0)
die("No matched lines found in %s.", pf->fname); die("No matched lines found in %s.", pf->fname);
} }
...@@ -596,7 +577,7 @@ static void find_probe_point_lazy(Dwarf_Die *sp_die, struct probe_finder *pf) ...@@ -596,7 +577,7 @@ static void find_probe_point_lazy(Dwarf_Die *sp_die, struct probe_finder *pf)
(int)i, lineno, (unsigned long long)addr); (int)i, lineno, (unsigned long long)addr);
pf->addr = addr; pf->addr = addr;
show_probe_point(sp_die, pf); convert_probe_point(sp_die, pf);
/* Continuing, because target line might be inlined. */ /* Continuing, because target line might be inlined. */
} }
/* TODO: deallocate lines, but how? */ /* TODO: deallocate lines, but how? */
...@@ -605,7 +586,7 @@ static void find_probe_point_lazy(Dwarf_Die *sp_die, struct probe_finder *pf) ...@@ -605,7 +586,7 @@ static void find_probe_point_lazy(Dwarf_Die *sp_die, struct probe_finder *pf)
static int probe_point_inline_cb(Dwarf_Die *in_die, void *data) static int probe_point_inline_cb(Dwarf_Die *in_die, void *data)
{ {
struct probe_finder *pf = (struct probe_finder *)data; struct probe_finder *pf = (struct probe_finder *)data;
struct probe_point *pp = pf->pp; struct perf_probe_point *pp = &pf->pev->point;
if (pp->lazy_line) if (pp->lazy_line)
find_probe_point_lazy(in_die, pf); find_probe_point_lazy(in_die, pf);
...@@ -616,7 +597,7 @@ static int probe_point_inline_cb(Dwarf_Die *in_die, void *data) ...@@ -616,7 +597,7 @@ static int probe_point_inline_cb(Dwarf_Die *in_die, void *data)
pr_debug("found inline addr: 0x%jx\n", pr_debug("found inline addr: 0x%jx\n",
(uintmax_t)pf->addr); (uintmax_t)pf->addr);
show_probe_point(in_die, pf); convert_probe_point(in_die, pf);
} }
return DWARF_CB_OK; return DWARF_CB_OK;
...@@ -626,7 +607,7 @@ static int probe_point_inline_cb(Dwarf_Die *in_die, void *data) ...@@ -626,7 +607,7 @@ static int probe_point_inline_cb(Dwarf_Die *in_die, void *data)
static int probe_point_search_cb(Dwarf_Die *sp_die, void *data) static int probe_point_search_cb(Dwarf_Die *sp_die, void *data)
{ {
struct probe_finder *pf = (struct probe_finder *)data; struct probe_finder *pf = (struct probe_finder *)data;
struct probe_point *pp = pf->pp; struct perf_probe_point *pp = &pf->pev->point;
/* Check tag and diename */ /* Check tag and diename */
if (dwarf_tag(sp_die) != DW_TAG_subprogram || if (dwarf_tag(sp_die) != DW_TAG_subprogram ||
...@@ -646,7 +627,7 @@ static int probe_point_search_cb(Dwarf_Die *sp_die, void *data) ...@@ -646,7 +627,7 @@ static int probe_point_search_cb(Dwarf_Die *sp_die, void *data)
pf->addr = die_get_entrypc(sp_die); pf->addr = die_get_entrypc(sp_die);
pf->addr += pp->offset; pf->addr += pp->offset;
/* TODO: Check the address in this function */ /* TODO: Check the address in this function */
show_probe_point(sp_die, pf); convert_probe_point(sp_die, pf);
} }
} else } else
/* Inlined function: search instances */ /* Inlined function: search instances */
...@@ -660,20 +641,25 @@ static void find_probe_point_by_func(struct probe_finder *pf) ...@@ -660,20 +641,25 @@ static void find_probe_point_by_func(struct probe_finder *pf)
dwarf_getfuncs(&pf->cu_die, probe_point_search_cb, pf, 0); dwarf_getfuncs(&pf->cu_die, probe_point_search_cb, pf, 0);
} }
/* Find a probe point */ /* Find kprobe_trace_events specified by perf_probe_event from debuginfo */
int find_probe_point(int fd, struct probe_point *pp) int find_kprobe_trace_events(int fd, struct perf_probe_event *pev,
struct kprobe_trace_event **tevs)
{ {
struct probe_finder pf = {.pp = pp}; struct probe_finder pf = {.pev = pev};
struct perf_probe_point *pp = &pev->point;
Dwarf_Off off, noff; Dwarf_Off off, noff;
size_t cuhl; size_t cuhl;
Dwarf_Die *diep; Dwarf_Die *diep;
Dwarf *dbg; Dwarf *dbg;
pf.tevs = xzalloc(sizeof(struct kprobe_trace_event) * MAX_PROBES);
*tevs = pf.tevs;
pf.ntevs = 0;
dbg = dwarf_begin(fd, DWARF_C_READ); dbg = dwarf_begin(fd, DWARF_C_READ);
if (!dbg) if (!dbg)
return -ENOENT; return -ENOENT;
pp->found = 0;
off = 0; off = 0;
line_list__init(&pf.lcache); line_list__init(&pf.lcache);
/* Loop on CUs (Compilation Unit) */ /* Loop on CUs (Compilation Unit) */
...@@ -704,7 +690,7 @@ int find_probe_point(int fd, struct probe_point *pp) ...@@ -704,7 +690,7 @@ int find_probe_point(int fd, struct probe_point *pp)
line_list__free(&pf.lcache); line_list__free(&pf.lcache);
dwarf_end(dbg); dwarf_end(dbg);
return pp->found; return pf.ntevs;
} }
/* Find line range from its line number */ /* Find line range from its line number */
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#include <stdbool.h> #include <stdbool.h>
#include "util.h" #include "util.h"
#include "probe-event.h"
#define MAX_PATH_LEN 256 #define MAX_PATH_LEN 256
#define MAX_PROBE_BUFFER 1024 #define MAX_PROBE_BUFFER 1024
...@@ -14,67 +15,32 @@ static inline int is_c_varname(const char *name) ...@@ -14,67 +15,32 @@ static inline int is_c_varname(const char *name)
return isalpha(name[0]) || name[0] == '_'; return isalpha(name[0]) || name[0] == '_';
} }
struct probe_point {
char *event; /* Event name */
char *group; /* Event group */
/* Inputs */
char *file; /* File name */
int line; /* Line number */
char *lazy_line; /* Lazy line pattern */
char *function; /* Function name */
int offset; /* Offset bytes */
int nr_args; /* Number of arguments */
char **args; /* Arguments */
int retprobe; /* Return probe */
/* Output */
int found; /* Number of found probe points */
char *probes[MAX_PROBES]; /* Output buffers (will be allocated)*/
};
/* Line number container */
struct line_node {
struct list_head list;
unsigned int line;
};
/* Line range */
struct line_range {
char *file; /* File name */
char *function; /* Function name */
unsigned int start; /* Start line number */
unsigned int end; /* End line number */
int offset; /* Start line offset */
char *path; /* Real path name */
struct list_head line_list; /* Visible lines */
};
#ifndef NO_DWARF_SUPPORT #ifndef NO_DWARF_SUPPORT
extern int find_probe_point(int fd, struct probe_point *pp); /* Find kprobe_trace_events specified by perf_probe_event from debuginfo */
extern int find_kprobe_trace_events(int fd, struct perf_probe_event *pev,
struct kprobe_trace_event **tevs);
extern int find_line_range(int fd, struct line_range *lr); extern int find_line_range(int fd, struct line_range *lr);
#include <dwarf.h> #include <dwarf.h>
#include <libdw.h> #include <libdw.h>
struct probe_finder { struct probe_finder {
struct probe_point *pp; /* Target probe point */ struct perf_probe_event *pev; /* Target probe event */
int ntevs; /* number of trace events */
struct kprobe_trace_event *tevs; /* Result trace events */
/* For function searching */ /* For function searching */
Dwarf_Addr addr; /* Address */ Dwarf_Addr addr; /* Address */
const char *fname; /* File name */ const char *fname; /* Real file name */
int lno; /* Line number */ int lno; /* Line number */
Dwarf_Die cu_die; /* Current CU */ Dwarf_Die cu_die; /* Current CU */
struct list_head lcache; /* Line cache for lazy match */
/* For variable searching */ /* For variable searching */
Dwarf_Op *fb_ops; /* Frame base attribute */ Dwarf_Op *fb_ops; /* Frame base attribute */
const char *var; /* Current variable name */ struct perf_probe_arg *pvar; /* Current target variable */
char *buf; /* Current output buffer */ struct kprobe_trace_arg *tvar; /* Current result variable */
int len; /* Length of output buffer */
struct list_head lcache; /* Line cache for lazy match */
}; };
struct line_finder { struct line_finder {
......
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