lkml.org 
[lkml]   [2011]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -tip 01/13] [CLEANUP]tracing/kprobes: Rename probe_* to trace_probe_*
    Date
    Rename probe_* to trace_probe_* for avoiding namespace
    confliction. This also fixes improper names of find_probe_event()
    and cleanup_all_probes() to find_trace_probe() and
    release_all_trace_probes() respectively.

    Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Ingo Molnar <mingo@redhat.com>
    ---

    kernel/trace/trace_kprobe.c | 43 ++++++++++++++++++++++---------------------
    1 files changed, 22 insertions(+), 21 deletions(-)

    diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
    index 27d13b3..bad87e9 100644
    --- a/kernel/trace/trace_kprobe.c
    +++ b/kernel/trace/trace_kprobe.c
    @@ -555,12 +555,12 @@ struct trace_probe {
    (sizeof(struct probe_arg) * (n)))


    -static __kprobes int probe_is_return(struct trace_probe *tp)
    +static __kprobes int trace_probe_is_return(struct trace_probe *tp)
    {
    return tp->rp.handler != NULL;
    }

    -static __kprobes const char *probe_symbol(struct trace_probe *tp)
    +static __kprobes const char *trace_probe_symbol(struct trace_probe *tp)
    {
    return tp->symbol ? tp->symbol : "unknown";
    }
    @@ -671,7 +671,7 @@ static void free_trace_probe(struct trace_probe *tp)
    kfree(tp);
    }

    -static struct trace_probe *find_probe_event(const char *event,
    +static struct trace_probe *find_trace_probe(const char *event,
    const char *group)
    {
    struct trace_probe *tp;
    @@ -686,7 +686,7 @@ static struct trace_probe *find_probe_event(const char *event,
    /* Unregister a trace_probe and probe_event: call with locking probe_lock */
    static void unregister_trace_probe(struct trace_probe *tp)
    {
    - if (probe_is_return(tp))
    + if (trace_probe_is_return(tp))
    unregister_kretprobe(&tp->rp);
    else
    unregister_kprobe(&tp->rp.kp);
    @@ -703,7 +703,7 @@ static int register_trace_probe(struct trace_probe *tp)
    mutex_lock(&probe_lock);

    /* register as an event */
    - old_tp = find_probe_event(tp->call.name, tp->call.class->system);
    + old_tp = find_trace_probe(tp->call.name, tp->call.class->system);
    if (old_tp) {
    /* delete old event */
    unregister_trace_probe(old_tp);
    @@ -716,7 +716,7 @@ static int register_trace_probe(struct trace_probe *tp)
    }

    tp->rp.kp.flags |= KPROBE_FLAG_DISABLED;
    - if (probe_is_return(tp))
    + if (trace_probe_is_return(tp))
    ret = register_kretprobe(&tp->rp);
    else
    ret = register_kprobe(&tp->rp.kp);
    @@ -1025,7 +1025,7 @@ static int create_trace_probe(int argc, char **argv)
    return -EINVAL;
    }
    mutex_lock(&probe_lock);
    - tp = find_probe_event(event, group);
    + tp = find_trace_probe(event, group);
    if (!tp) {
    mutex_unlock(&probe_lock);
    pr_info("Event %s/%s doesn't exist.\n", group, event);
    @@ -1144,7 +1144,7 @@ error:
    return ret;
    }

    -static void cleanup_all_probes(void)
    +static void release_all_trace_probes(void)
    {
    struct trace_probe *tp;

    @@ -1181,15 +1181,16 @@ static int probes_seq_show(struct seq_file *m, void *v)
    struct trace_probe *tp = v;
    int i;

    - seq_printf(m, "%c", probe_is_return(tp) ? 'r' : 'p');
    + seq_printf(m, "%c", trace_probe_is_return(tp) ? 'r' : 'p');
    seq_printf(m, ":%s/%s", tp->call.class->system, tp->call.name);

    if (!tp->symbol)
    seq_printf(m, " 0x%p", tp->rp.kp.addr);
    else if (tp->rp.kp.offset)
    - seq_printf(m, " %s+%u", probe_symbol(tp), tp->rp.kp.offset);
    + seq_printf(m, " %s+%u", trace_probe_symbol(tp),
    + tp->rp.kp.offset);
    else
    - seq_printf(m, " %s", probe_symbol(tp));
    + seq_printf(m, " %s", trace_probe_symbol(tp));

    for (i = 0; i < tp->nr_args; i++)
    seq_printf(m, " %s=%s", tp->args[i].name, tp->args[i].comm);
    @@ -1209,7 +1210,7 @@ static int probes_open(struct inode *inode, struct file *file)
    {
    if ((file->f_mode & FMODE_WRITE) &&
    (file->f_flags & O_TRUNC))
    - cleanup_all_probes();
    + release_all_trace_probes();

    return seq_open(file, &probes_seq_op);
    }
    @@ -1516,7 +1517,7 @@ static int probe_event_enable(struct ftrace_event_call *call)
    struct trace_probe *tp = (struct trace_probe *)call->data;

    tp->flags |= TP_FLAG_TRACE;
    - if (probe_is_return(tp))
    + if (trace_probe_is_return(tp))
    return enable_kretprobe(&tp->rp);
    else
    return enable_kprobe(&tp->rp.kp);
    @@ -1528,7 +1529,7 @@ static void probe_event_disable(struct ftrace_event_call *call)

    tp->flags &= ~TP_FLAG_TRACE;
    if (!(tp->flags & (TP_FLAG_TRACE | TP_FLAG_PROFILE))) {
    - if (probe_is_return(tp))
    + if (trace_probe_is_return(tp))
    disable_kretprobe(&tp->rp);
    else
    disable_kprobe(&tp->rp.kp);
    @@ -1596,7 +1597,7 @@ static int __set_print_fmt(struct trace_probe *tp, char *buf, int len)

    const char *fmt, *arg;

    - if (!probe_is_return(tp)) {
    + if (!trace_probe_is_return(tp)) {
    fmt = "(%lx)";
    arg = "REC->" FIELD_STRING_IP;
    } else {
    @@ -1720,7 +1721,7 @@ static int probe_perf_enable(struct ftrace_event_call *call)

    tp->flags |= TP_FLAG_PROFILE;

    - if (probe_is_return(tp))
    + if (trace_probe_is_return(tp))
    return enable_kretprobe(&tp->rp);
    else
    return enable_kprobe(&tp->rp.kp);
    @@ -1733,7 +1734,7 @@ static void probe_perf_disable(struct ftrace_event_call *call)
    tp->flags &= ~TP_FLAG_PROFILE;

    if (!(tp->flags & TP_FLAG_TRACE)) {
    - if (probe_is_return(tp))
    + if (trace_probe_is_return(tp))
    disable_kretprobe(&tp->rp);
    else
    disable_kprobe(&tp->rp.kp);
    @@ -1805,7 +1806,7 @@ static int register_probe_event(struct trace_probe *tp)

    /* Initialize ftrace_event_call */
    INIT_LIST_HEAD(&call->class->fields);
    - if (probe_is_return(tp)) {
    + if (trace_probe_is_return(tp)) {
    call->event.funcs = &kretprobe_funcs;
    call->class->define_fields = kretprobe_event_define_fields;
    } else {
    @@ -1897,7 +1898,7 @@ static __init int kprobe_trace_self_tests_init(void)
    warn++;
    } else {
    /* Enable trace point */
    - tp = find_probe_event("testprobe", KPROBE_EVENT_SYSTEM);
    + tp = find_trace_probe("testprobe", KPROBE_EVENT_SYSTEM);
    if (WARN_ON_ONCE(tp == NULL)) {
    pr_warning("error on getting new probe.\n");
    warn++;
    @@ -1912,7 +1913,7 @@ static __init int kprobe_trace_self_tests_init(void)
    warn++;
    } else {
    /* Enable trace point */
    - tp = find_probe_event("testprobe2", KPROBE_EVENT_SYSTEM);
    + tp = find_trace_probe("testprobe2", KPROBE_EVENT_SYSTEM);
    if (WARN_ON_ONCE(tp == NULL)) {
    pr_warning("error on getting new probe.\n");
    warn++;
    @@ -1938,7 +1939,7 @@ static __init int kprobe_trace_self_tests_init(void)
    }

    end:
    - cleanup_all_probes();
    + release_all_trace_probes();
    if (warn)
    pr_cont("NG: Some tests are failed. Please check them.\n");
    else


    \
     
     \ /
      Last update: 2011-06-28 14:27    [W:0.033 / U:31.200 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site