trace: assign defaults at register_ftrace_event
Subsystems (2)
PATCH 1/1 trace: assign defaults at register_ftrace_event
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.
--- block/blktrace.c | 2 -- kernel/trace/trace.c | 13 +++++-------- kernel/trace/trace_branch.c | 3 --- kernel/trace/trace_output.c | 13 +++++++++++-- 4 files changed, 16 insertions(+), 15 deletions(-)
block/blktrace.c +0 -2
@@ -1243,8 +1243,6 @@ static struct trace_event trace_blk_event = { .type = TRACE_BLK, .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, };
kernel/trace/trace.c +5 -8
@@ -1412,7 +1412,7 @@ static enum print_line_t print_lat_fmt(struct trace_iterator *iter) goto partial; } -if (event && event->latency_trace) +if (event)return event->latency_trace (iter, sym_flags);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; } -if (event && event->trace) +if (event)return event->trace (iter, sym_flags);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); -if (event && event->raw) +if (event)return event->raw (iter,0 );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); -if (event && event->hex) { +if (event) {enum print_line_t ret = event->hex (iter,0 );if (ret !=TRACE_TYPE_HANDLED )return ret;
@@ -1536,10 +1536,7 @@ static enum print_line_t print_bin_fmt(struct trace_iterator *iter) } event =ftrace_find_event (entry->type); -if (event && event->binary) -return event->binary (iter,0 ); - -return TRACE_TYPE_HANDLED ; +return event ? event->binary (iter,0 ) :TRACE_TYPE_HANDLED ; }static int trace_empty (struct trace_iterator *iter)
kernel/trace/trace_branch.c +0 -3
@@ -182,9 +182,6 @@ static struct trace_event trace_branch_event = { .type = TRACE_BRANCH, .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 =
kernel/trace/trace_output.c +11 -2
@@ -435,6 +435,17 @@ int register_ftrace_event(struct trace_event *event)if (ftrace_find_event (event->type)) 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 );hlist_add_head_rcu (&event->node, &event_hash[key]);
@@ -874,8 +885,6 @@ static struct trace_event trace_print_event = { .trace = trace_print_print, .latency_trace = trace_print_print, .raw = trace_print_raw, - .hex = trace_nop_print, - .binary = trace_nop_print, };static struct trace_event *events[]__initdata = {
Signature · 1 line
1.6.0.6
Quoted 130 lines · Arnaldo Carvalho de Melo
Impact: simplification of tracers
As all tracers are doing this we might as well do it in
register_ftrace_eventand save one branch each time we call these callbacks.Cc Ingo Molnar <[email protected]>Cc Frédéric Weisbecker <[email protected]>Cc Jens Axboe <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>--- block/blktrace.c | 2 -- kernel/trace/trace.c | 13 +++++-------- kernel/trace/trace_branch.c | 3 --- kernel/trace/trace_output.c | 13 +++++++++++-- 4 files changed, 16 insertions(+), 15 deletions(-)block/blktrace.c +0
-2@@ -1243,8 +1243,6 @@ static struct trace_event trace_blk_event = { .type = TRACE_BLK, .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, };kernel/trace/trace.c +5
-8@@ -1412,7 +1412,7 @@ static enum print_line_t print_lat_fmt(struct trace_iterator *iter) goto partial; } -if (event && event->latency_trace) +if (event)return event->latency_trace (iter, sym_flags);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; } -if (event && event->trace) +if (event)return event->trace (iter, sym_flags);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); -if (event && event->raw) +if (event)return event->raw (iter,0 );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); -if (event && event->hex) { +if (event) {enum print_line_t ret = event->hex (iter,0 );if (ret !=TRACE_TYPE_HANDLED )return ret;@@ -1536,10 +1536,7 @@ static enum print_line_t print_bin_fmt(struct trace_iterator *iter) } event =ftrace_find_event (entry->type); -if (event && event->binary) -return event->binary (iter,0 ); - -return TRACE_TYPE_HANDLED ; +return event ? event->binary (iter,0 ) :TRACE_TYPE_HANDLED ; }static int trace_empty (struct trace_iterator *iter)kernel/trace/trace_branch.c +0
-3@@ -182,9 +182,6 @@ static struct trace_event trace_branch_event = { .type = TRACE_BRANCH, .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 =kernel/trace/trace_output.c +11
-2@@ -435,6 +435,17 @@ int register_ftrace_event(struct trace_event *event)if (ftrace_find_event (event->type)) 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 );hlist_add_head_rcu (&event->node, &event_hash[key]);@@ -874,8 +885,6 @@ static struct trace_event trace_print_event = { .trace = trace_print_print, .latency_trace = trace_print_print, .raw = trace_print_raw, - .hex = trace_nop_print, - .binary = trace_nop_print, };static struct trace_event *events[]__initdata = {Signature · 1 line
1.6.0.6
Nice! This avoids one branch for each entry printed.
Em Thu, Feb 05, 2009 at 12:41:51AM +0100, Frederic Weisbecker escreveu:
Quoted 127 lines · Arnaldo Carvalho de Melo
Quoted 126 lines
Impact: simplification of tracers
As all tracers are doing this we might as well do it in
register_ftrace_eventand save one branch each time we call these callbacks.Cc Ingo Molnar <[email protected]>Cc Frédéric Weisbecker <[email protected]>Cc Jens Axboe <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>--- block/blktrace.c | 2 -- kernel/trace/trace.c | 13 +++++-------- kernel/trace/trace_branch.c | 3 --- kernel/trace/trace_output.c | 13 +++++++++++-- 4 files changed, 16 insertions(+), 15 deletions(-)block/blktrace.c +0
-2@@ -1243,8 +1243,6 @@ static struct trace_event trace_blk_event = { .type = TRACE_BLK, .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, };kernel/trace/trace.c +5
-8@@ -1412,7 +1412,7 @@ static enum print_line_t print_lat_fmt(struct trace_iterator *iter) goto partial; } -if (event && event->latency_trace) +if (event)return event->latency_trace (iter, sym_flags);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; } -if (event && event->trace) +if (event)return event->trace (iter, sym_flags);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); -if (event && event->raw) +if (event)return event->raw (iter,0 );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); -if (event && event->hex) { +if (event) {enum print_line_t ret = event->hex (iter,0 );if (ret !=TRACE_TYPE_HANDLED )return ret;@@ -1536,10 +1536,7 @@ static enum print_line_t print_bin_fmt(struct trace_iterator *iter) } event =ftrace_find_event (entry->type); -if (event && event->binary) -return event->binary (iter,0 ); - -return TRACE_TYPE_HANDLED ; +return event ? event->binary (iter,0 ) :TRACE_TYPE_HANDLED ; }static int trace_empty (struct trace_iterator *iter)kernel/trace/trace_branch.c +0
-3@@ -182,9 +182,6 @@ static struct trace_event trace_branch_event = { .type = TRACE_BRANCH, .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 =kernel/trace/trace_output.c +11
-2@@ -435,6 +435,17 @@ int register_ftrace_event(struct trace_event *event)if (ftrace_find_event (event->type)) 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 );hlist_add_head_rcu (&event->node, &event_hash[key]);@@ -874,8 +885,6 @@ static struct trace_event trace_print_event = { .trace = trace_print_print, .latency_trace = trace_print_print, .raw = trace_print_raw, - .hex = trace_nop_print, - .binary = trace_nop_print, };
Quoted 7 lines
Quoted 4 lines
kernel/trace/trace_output.c +0
-0static struct trace_event *events[]__initdata = {Signature · 1 line
1.6.0.6Nice! This avoids one branch for each entry printed.
Is that an Acked-by in response to that CC? :-)
- Arnaldo
Quoted 136 lines · Arnaldo Carvalho de Melo
Em Thu, Feb 05, 2009 at 12:41:51AM +0100, Frederic Weisbecker escreveu:
Quoted 127 lines · Arnaldo Carvalho de Melo
Quoted 126 lines
Impact: simplification of tracers
As all tracers are doing this we might as well do it in
register_ftrace_eventand save one branch each time we call these callbacks.Cc Ingo Molnar <[email protected]>Cc Frédéric Weisbecker <[email protected]>Cc Jens Axboe <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>--- block/blktrace.c | 2 -- kernel/trace/trace.c | 13 +++++-------- kernel/trace/trace_branch.c | 3 --- kernel/trace/trace_output.c | 13 +++++++++++-- 4 files changed, 16 insertions(+), 15 deletions(-)block/blktrace.c +0
-2@@ -1243,8 +1243,6 @@ static struct trace_event trace_blk_event = { .type = TRACE_BLK, .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, };kernel/trace/trace.c +5
-8@@ -1412,7 +1412,7 @@ static enum print_line_t print_lat_fmt(struct trace_iterator *iter) goto partial; } -if (event && event->latency_trace) +if (event)return event->latency_trace (iter, sym_flags);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; } -if (event && event->trace) +if (event)return event->trace (iter, sym_flags);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); -if (event && event->raw) +if (event)return event->raw (iter,0 );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); -if (event && event->hex) { +if (event) {enum print_line_t ret = event->hex (iter,0 );if (ret !=TRACE_TYPE_HANDLED )return ret;@@ -1536,10 +1536,7 @@ static enum print_line_t print_bin_fmt(struct trace_iterator *iter) } event =ftrace_find_event (entry->type); -if (event && event->binary) -return event->binary (iter,0 ); - -return TRACE_TYPE_HANDLED ; +return event ? event->binary (iter,0 ) :TRACE_TYPE_HANDLED ; }static int trace_empty (struct trace_iterator *iter)kernel/trace/trace_branch.c +0
-3@@ -182,9 +182,6 @@ static struct trace_event trace_branch_event = { .type = TRACE_BRANCH, .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 =kernel/trace/trace_output.c +11
-2@@ -435,6 +435,17 @@ int register_ftrace_event(struct trace_event *event)if (ftrace_find_event (event->type)) 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 );hlist_add_head_rcu (&event->node, &event_hash[key]);@@ -874,8 +885,6 @@ static struct trace_event trace_print_event = { .trace = trace_print_print, .latency_trace = trace_print_print, .raw = trace_print_raw, - .hex = trace_nop_print, - .binary = trace_nop_print, };Quoted 7 lines
Quoted 4 lines
kernel/trace/trace_output.c +0
-0static struct trace_event *events[]__initdata = {Signature · 1 line
1.6.0.6Nice! This avoids one branch for each entry printed.
Quoted 1 line
Is that an Acked-by in response to that CC? :-)
yes, i generally treat such replies as an implicit Acked-by and add them - already added Fredric's acks to two other commits of yours earlier today. An explicit Acked-by is even more helpful though :-)
Ingo
Em Thu, Feb 05, 2009 at 02:24:30AM +0100, Ingo Molnar escreveu:
Quoted 9 lines · Arnaldo Carvalho de Melo
Quoted 4 lines
Em Thu, Feb 05, 2009 at 12:41:51AM +0100, Frederic Weisbecker escreveu:
Quoted 1 line
Nice! This avoids one branch for each entry printed.
Is that an Acked-by in response to that CC? :-)
yes, i generally treat such replies as an implicit Acked-by and add them - already added Fredric's acks to two other commits of yours earlier today. An explicit Acked-by is even more helpful though :-)
I really appreciate that, this fine granularity on who is doing what is really refreshing, deserved and encouraging.
- Arnaldo
Quoted 139 lines · Ingo Molnar
Quoted 136 lines · Arnaldo Carvalho de Melo
Em Thu, Feb 05, 2009 at 12:41:51AM +0100, Frederic Weisbecker escreveu:
Quoted 134 lines · Arnaldo Carvalho de Melo
Quoted 130 lines
Impact: simplification of tracers
As all tracers are doing this we might as well do it in
register_ftrace_eventand save one branch each time we call these callbacks.Cc Ingo Molnar <[email protected]>Cc Frédéric Weisbecker <[email protected]>Cc Jens Axboe <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>--- block/blktrace.c | 2 -- kernel/trace/trace.c | 13 +++++-------- kernel/trace/trace_branch.c | 3 --- kernel/trace/trace_output.c | 13 +++++++++++-- 4 files changed, 16 insertions(+), 15 deletions(-)block/blktrace.c +0
-2@@ -1243,8 +1243,6 @@ static struct trace_event trace_blk_event = { .type = TRACE_BLK, .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, };kernel/trace/trace.c +5
-8@@ -1412,7 +1412,7 @@ static enum print_line_t print_lat_fmt(struct trace_iterator *iter) goto partial; } -if (event && event->latency_trace) +if (event)return event->latency_trace (iter, sym_flags);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; } -if (event && event->trace) +if (event)return event->trace (iter, sym_flags);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); -if (event && event->raw) +if (event)return event->raw (iter,0 );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); -if (event && event->hex) { +if (event) {enum print_line_t ret = event->hex (iter,0 );if (ret !=TRACE_TYPE_HANDLED )return ret;@@ -1536,10 +1536,7 @@ static enum print_line_t print_bin_fmt(struct trace_iterator *iter) } event =ftrace_find_event (entry->type); -if (event && event->binary) -return event->binary (iter,0 ); - -return TRACE_TYPE_HANDLED ; +return event ? event->binary (iter,0 ) :TRACE_TYPE_HANDLED ; }static int trace_empty (struct trace_iterator *iter)kernel/trace/trace_branch.c +0
-3@@ -182,9 +182,6 @@ static struct trace_event trace_branch_event = { .type = TRACE_BRANCH, .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 =kernel/trace/trace_output.c +11
-2@@ -435,6 +435,17 @@ int register_ftrace_event(struct trace_event *event)if (ftrace_find_event (event->type)) 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 );hlist_add_head_rcu (&event->node, &event_hash[key]);@@ -874,8 +885,6 @@ static struct trace_event trace_print_event = { .trace = trace_print_print, .latency_trace = trace_print_print, .raw = trace_print_raw, - .hex = trace_nop_print, - .binary = trace_nop_print, };static struct trace_event *events[]__initdata = {Signature · 1 line
1.6.0.6Nice! This avoids one branch for each entry printed.
Quoted 7 lines
Quoted 1 line
Is that an Acked-by in response to that CC? :-)
yes, i generally treat such replies as an implicit Acked-by and add them - already added Fredric's acks to two other commits of yours earlier today. An explicit Acked-by is even more helpful though :-)
Ingo
Heh, I'm not a tracing/core/ftrace maintainer, so I wouldn't dare put my Acked-by unless it touches a file I started :-)
Concerning tracing/core/ftrace/tracers, I review the patches that come if I have the time to and tell what I think about it. But in my opinion, the Acked-by on this area are more appropriate if they come from Steven :-)
Quoted 8 lines · Ingo Molnar
Quoted 4 lines
Quoted 2 lines
Nice! This avoids one branch for each entry printed.
Is that an Acked-by in response to that CC? :-)
yes, i generally treat such replies as an implicit Acked-by and add them - already added Fredric's acks to two other commits of yours earlier today. An explicit Acked-by is even more helpful though :-)
Although it is probably too late, I'll join in on the fun.
-- Steve
Quoted 146 lines · Frederic Weisbecker
Quoted 145 lines · Ingo Molnar
Quoted 136 lines · Arnaldo Carvalho de Melo
Em Thu, Feb 05, 2009 at 12:41:51AM +0100, Frederic Weisbecker escreveu:
Quoted 127 lines · Arnaldo Carvalho de Melo
Quoted 126 lines
Impact: simplification of tracers
As all tracers are doing this we might as well do it in
register_ftrace_eventand save one branch each time we call these callbacks.Cc Ingo Molnar <[email protected]>Cc Frédéric Weisbecker <[email protected]>Cc Jens Axboe <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>--- block/blktrace.c | 2 -- kernel/trace/trace.c | 13 +++++-------- kernel/trace/trace_branch.c | 3 --- kernel/trace/trace_output.c | 13 +++++++++++-- 4 files changed, 16 insertions(+), 15 deletions(-)block/blktrace.c +0
-2@@ -1243,8 +1243,6 @@ static struct trace_event trace_blk_event = { .type = TRACE_BLK, .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, };kernel/trace/trace.c +5
-8@@ -1412,7 +1412,7 @@ static enum print_line_t print_lat_fmt(struct trace_iterator *iter) goto partial; } -if (event && event->latency_trace) +if (event)return event->latency_trace (iter, sym_flags);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; } -if (event && event->trace) +if (event)return event->trace (iter, sym_flags);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); -if (event && event->raw) +if (event)return event->raw (iter,0 );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); -if (event && event->hex) { +if (event) {enum print_line_t ret = event->hex (iter,0 );if (ret !=TRACE_TYPE_HANDLED )return ret;@@ -1536,10 +1536,7 @@ static enum print_line_t print_bin_fmt(struct trace_iterator *iter) } event =ftrace_find_event (entry->type); -if (event && event->binary) -return event->binary (iter,0 ); - -return TRACE_TYPE_HANDLED ; +return event ? event->binary (iter,0 ) :TRACE_TYPE_HANDLED ; }static int trace_empty (struct trace_iterator *iter)kernel/trace/trace_branch.c +0
-3@@ -182,9 +182,6 @@ static struct trace_event trace_branch_event = { .type = TRACE_BRANCH, .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 =kernel/trace/trace_output.c +11
-2@@ -435,6 +435,17 @@ int register_ftrace_event(struct trace_event *event)if (ftrace_find_event (event->type)) 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 );hlist_add_head_rcu (&event->node, &event_hash[key]);@@ -874,8 +885,6 @@ static struct trace_event trace_print_event = { .trace = trace_print_print, .latency_trace = trace_print_print, .raw = trace_print_raw, - .hex = trace_nop_print, - .binary = trace_nop_print, };Quoted 7 lines
Quoted 4 lines
kernel/trace/trace_output.c +0
-0static struct trace_event *events[]__initdata = {Signature · 1 line
1.6.0.6Nice! This avoids one branch for each entry printed.
Quoted 1 line
Is that an Acked-by in response to that CC? :-)
yes, i generally treat such replies as an implicit Acked-by and add them - already added Fredric's acks to two other commits of yours earlier today. An explicit Acked-by is even more helpful though :-)
Quoted 8 lines
Quoted 1 line
Ingo
Heh, I'm not a tracing/core/ftrace maintainer, so I wouldn't dare put my Acked-by unless it touches a file I started :-) Concerning tracing/core/ftrace/tracers, I review the patches that come if I have the time to and tell what I think about it. But in my opinion, the Acked-by on this area are more appropriate if they come from Steven :-)
if you read a patch, in an area of code that you know well (which you do in this case), and if you find the patch it a step forward with no defects then feel free to post an Acked-by.
You absolutely dont have to be the primary author of a file to do that. All such help makes maintenance easier and is much appreciated.
Ingo
Quoted 158 lines · Ingo Molnar
Quoted 146 lines · Frederic Weisbecker
Quoted 145 lines · Ingo Molnar
Quoted 136 lines · Arnaldo Carvalho de Melo
Em Thu, Feb 05, 2009 at 12:41:51AM +0100, Frederic Weisbecker escreveu:
Quoted 127 lines · Arnaldo Carvalho de Melo
Quoted 126 lines
Impact: simplification of tracers
As all tracers are doing this we might as well do it in
register_ftrace_eventand save one branch each time we call these callbacks.Cc Ingo Molnar <[email protected]>Cc Frédéric Weisbecker <[email protected]>Cc Jens Axboe <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>--- block/blktrace.c | 2 -- kernel/trace/trace.c | 13 +++++-------- kernel/trace/trace_branch.c | 3 --- kernel/trace/trace_output.c | 13 +++++++++++-- 4 files changed, 16 insertions(+), 15 deletions(-)block/blktrace.c +0
-2@@ -1243,8 +1243,6 @@ static struct trace_event trace_blk_event = { .type = TRACE_BLK, .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, };kernel/trace/trace.c +5
-8@@ -1412,7 +1412,7 @@ static enum print_line_t print_lat_fmt(struct trace_iterator *iter) goto partial; } -if (event && event->latency_trace) +if (event)return event->latency_trace (iter, sym_flags);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; } -if (event && event->trace) +if (event)return event->trace (iter, sym_flags);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); -if (event && event->raw) +if (event)return event->raw (iter,0 );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); -if (event && event->hex) { +if (event) {enum print_line_t ret = event->hex (iter,0 );if (ret !=TRACE_TYPE_HANDLED )return ret;@@ -1536,10 +1536,7 @@ static enum print_line_t print_bin_fmt(struct trace_iterator *iter) } event =ftrace_find_event (entry->type); -if (event && event->binary) -return event->binary (iter,0 ); - -return TRACE_TYPE_HANDLED ; +return event ? event->binary (iter,0 ) :TRACE_TYPE_HANDLED ; }static int trace_empty (struct trace_iterator *iter)kernel/trace/trace_branch.c +0
-3@@ -182,9 +182,6 @@ static struct trace_event trace_branch_event = { .type = TRACE_BRANCH, .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 =kernel/trace/trace_output.c +11
-2@@ -435,6 +435,17 @@ int register_ftrace_event(struct trace_event *event)if (ftrace_find_event (event->type)) 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 );hlist_add_head_rcu (&event->node, &event_hash[key]);@@ -874,8 +885,6 @@ static struct trace_event trace_print_event = { .trace = trace_print_print, .latency_trace = trace_print_print, .raw = trace_print_raw, - .hex = trace_nop_print, - .binary = trace_nop_print, };Quoted 7 lines
Quoted 4 lines
kernel/trace/trace_output.c +0
-0static struct trace_event *events[]__initdata = {Signature · 1 line
1.6.0.6Nice! This avoids one branch for each entry printed.
Quoted 1 line
Is that an Acked-by in response to that CC? :-)
yes, i generally treat such replies as an implicit Acked-by and add them - already added Fredric's acks to two other commits of yours earlier today. An explicit Acked-by is even more helpful though :-)
Quoted 8 lines
Quoted 1 line
Ingo
Heh, I'm not a tracing/core/ftrace maintainer, so I wouldn't dare put my Acked-by unless it touches a file I started :-) Concerning tracing/core/ftrace/tracers, I review the patches that come if I have the time to and tell what I think about it. But in my opinion, the Acked-by on this area are more appropriate if they come from Steven :-)
Quoted 8 lines
if you read a patch, in an area of code that you know well (which you do in this case), and if you find the patch it a step forward with no defects then feel free to post an Acked-by.
You absolutely dont have to be the primary author of a file to do that. All such help makes maintenance easier and is much appreciated.
Ingo
Ok, I will remember that.
Thanks!
Ingo Molnar
AppliedQuoted 10 lines · Arnaldo Carvalho de Melo
Impact: simplification of tracers
As all tracers are doing this we might as well do it in
register_ftrace_eventand save one branch each time we call these callbacks.Cc Ingo Molnar <[email protected]>Cc Frédéric Weisbecker <[email protected]>Cc Jens Axboe <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
Quoted 6 lines
--- block/blktrace.c | 2 -- kernel/trace/trace.c | 13 +++++-------- kernel/trace/trace_branch.c | 3 --- kernel/trace/trace_output.c | 13 +++++++++++-- 4 files changed, 16 insertions(+), 15 deletions(-)
Applied to tip/tracing/ftrace, thanks guys!
Ingo