kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

trace: assign defaults at register_ftrace_event

Browse source 
Impact: simplification of tracers

As all tracers are doing this we might as well do it in
register_ftrace_event and save one branch each time we call these
callbacks.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Acked-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Arnaldo Carvalho de Melo 2009-02-04 20:16:39 -02:00 committed by Ingo Molnar
parent 43769f10b4
commit 268ccda0cb
4 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
block/blktrace.c
View file

@ -1243,8 +1243,6 @@ static struct trace_event trace_blk_event = {
.type = TRACE_BLK, .type = TRACE_BLK,
.trace = blk_trace_event_print, .trace = blk_trace_event_print,
.latency_trace = blk_trace_event_print, .latency_trace = blk_trace_event_print,
.raw = trace_nop_print,
.hex = trace_nop_print,
.binary = blk_trace_event_print_binary, .binary = blk_trace_event_print_binary,
}; };

13
kernel/trace/trace.c
View file

@ -1412,7 +1412,7 @@ static enum print_line_t print_lat_fmt(struct trace_iterator *iter)
goto partial; goto partial;
} }
if (event && event->latency_trace) if (event)
return event->latency_trace(iter, sym_flags); return event->latency_trace(iter, sym_flags);
if (!trace_seq_printf(s, "Unknown type %d\n", entry->type)) if (!trace_seq_printf(s, "Unknown type %d\n", entry->type))
@ -1441,7 +1441,7 @@ static enum print_line_t print_trace_fmt(struct trace_iterator *iter)
goto partial; goto partial;
} }
if (event && event->trace) if (event)
return event->trace(iter, sym_flags); return event->trace(iter, sym_flags);
if (!trace_seq_printf(s, "Unknown type %d\n", entry->type)) if (!trace_seq_printf(s, "Unknown type %d\n", entry->type))
@ -1467,7 +1467,7 @@ static enum print_line_t print_raw_fmt(struct trace_iterator *iter)
} }
event = ftrace_find_event(entry->type); event = ftrace_find_event(entry->type);
if (event && event->raw) if (event)
return event->raw(iter, 0); return event->raw(iter, 0);
if (!trace_seq_printf(s, "%d ?\n", entry->type)) if (!trace_seq_printf(s, "%d ?\n", entry->type))
@ -1494,7 +1494,7 @@ static enum print_line_t print_hex_fmt(struct trace_iterator *iter)
} }
event = ftrace_find_event(entry->type); event = ftrace_find_event(entry->type);
if (event && event->hex) { if (event) {
enum print_line_t ret = event->hex(iter, 0); enum print_line_t ret = event->hex(iter, 0);
if (ret != TRACE_TYPE_HANDLED) if (ret != TRACE_TYPE_HANDLED)
return ret; return ret;
@ -1536,10 +1536,7 @@ static enum print_line_t print_bin_fmt(struct trace_iterator *iter)
} }
event = ftrace_find_event(entry->type); event = ftrace_find_event(entry->type);
if (event && event->binary) return event ? event->binary(iter, 0) : TRACE_TYPE_HANDLED;
return event->binary(iter, 0);
return TRACE_TYPE_HANDLED;
} }
static int trace_empty(struct trace_iterator *iter) static int trace_empty(struct trace_iterator *iter)

3
kernel/trace/trace_branch.c
View file

@ -182,9 +182,6 @@ static struct trace_event trace_branch_event = {
.type = TRACE_BRANCH, .type = TRACE_BRANCH,
.trace = trace_branch_print, .trace = trace_branch_print,
.latency_trace = trace_branch_print, .latency_trace = trace_branch_print,
.raw = trace_nop_print,
.hex = trace_nop_print,
.binary = trace_nop_print,
}; };
static struct tracer branch_trace __read_mostly = static struct tracer branch_trace __read_mostly =

13
kernel/trace/trace_output.c
View file

@ -435,6 +435,17 @@ int register_ftrace_event(struct trace_event *event)
if (ftrace_find_event(event->type)) if (ftrace_find_event(event->type))
goto out; goto out;
if (event->trace == NULL)
event->trace = trace_nop_print;
if (event->latency_trace == NULL)
event->latency_trace = trace_nop_print;
if (event->raw == NULL)
event->raw = trace_nop_print;
if (event->hex == NULL)
event->hex = trace_nop_print;
if (event->binary == NULL)
event->binary = trace_nop_print;
key = event->type & (EVENT_HASHSIZE - 1); key = event->type & (EVENT_HASHSIZE - 1);
hlist_add_head_rcu(&event->node, &event_hash[key]); hlist_add_head_rcu(&event->node, &event_hash[key]);
@ -874,8 +885,6 @@ static struct trace_event trace_print_event = {
.trace = trace_print_print, .trace = trace_print_print,
.latency_trace = trace_print_print, .latency_trace = trace_print_print,
.raw = trace_print_raw, .raw = trace_print_raw,
.hex = trace_nop_print,
.binary = trace_nop_print,
}; };
static struct trace_event *events[] __initdata = { static struct trace_event *events[] __initdata = {