|
@@ -852,16 +852,14 @@ print_uprobe_event(struct trace_iterator *iter, int flags, struct trace_event *e
|
|
|
tu = container_of(event, struct trace_uprobe, tp.call.event);
|
|
|
|
|
|
if (is_ret_probe(tu)) {
|
|
|
- if (!trace_seq_printf(s, "%s: (0x%lx <- 0x%lx)",
|
|
|
- ftrace_event_name(&tu->tp.call),
|
|
|
- entry->vaddr[1], entry->vaddr[0]))
|
|
|
- goto partial;
|
|
|
+ trace_seq_printf(s, "%s: (0x%lx <- 0x%lx)",
|
|
|
+ ftrace_event_name(&tu->tp.call),
|
|
|
+ entry->vaddr[1], entry->vaddr[0]);
|
|
|
data = DATAOF_TRACE_ENTRY(entry, true);
|
|
|
} else {
|
|
|
- if (!trace_seq_printf(s, "%s: (0x%lx)",
|
|
|
- ftrace_event_name(&tu->tp.call),
|
|
|
- entry->vaddr[0]))
|
|
|
- goto partial;
|
|
|
+ trace_seq_printf(s, "%s: (0x%lx)",
|
|
|
+ ftrace_event_name(&tu->tp.call),
|
|
|
+ entry->vaddr[0]);
|
|
|
data = DATAOF_TRACE_ENTRY(entry, false);
|
|
|
}
|
|
|
|
|
@@ -869,14 +867,13 @@ print_uprobe_event(struct trace_iterator *iter, int flags, struct trace_event *e
|
|
|
struct probe_arg *parg = &tu->tp.args[i];
|
|
|
|
|
|
if (!parg->type->print(s, parg->name, data + parg->offset, entry))
|
|
|
- goto partial;
|
|
|
+ goto out;
|
|
|
}
|
|
|
|
|
|
- if (trace_seq_putc(s, '\n'))
|
|
|
- return TRACE_TYPE_HANDLED;
|
|
|
+ trace_seq_putc(s, '\n');
|
|
|
|
|
|
-partial:
|
|
|
- return TRACE_TYPE_PARTIAL_LINE;
|
|
|
+ out:
|
|
|
+ return trace_handle_return(s);
|
|
|
}
|
|
|
|
|
|
typedef bool (*filter_func_t)(struct uprobe_consumer *self,
|