trace_kprobes: don't output zero offset
PATCH 3/3 trace_kprobes: don't output zero offset
"symbol_name+0" is not so friendly.
It makes the output longer.
Signed-off-by Lai Jiangshan <[email protected]>
---
kernel/trace/trace_kprobe.c +9 -3
@@ -243,7 +243,11 @@ static int probe_arg_string(char *buf, size_t n, struct fetch_func *ff) ret =snprintf (buf, n,"@0x%p" , ff->data); else if (ff->func == fetch_symbol) {struct symbol_cache *sc = ff->data; - ret =snprintf (buf, n,"@%s%+ld" , sc->symbol, sc->offset); +if (sc->offset) + ret =snprintf (buf, n,"@%s%+ld" , sc->symbol, + sc->offset); +else + ret =snprintf (buf, n,"@%s" , sc->symbol); } else if (ff->func == fetch_retvalue) ret =snprintf (buf, n,"$retval" ); else if (ff->func == fetch_stack_address)
@@ -760,10 +764,12 @@ static int probes_seq_show(struct seq_file *m, void *v)seq_printf (m,"%c" ,probe_is_return (tp) ?'r' :'p' );seq_printf (m,":%s/%s" , tp->call.system, tp->call.name); -if (tp->symbol) +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);else -seq_printf (m," 0x%p" , tp->rp.kp.addr); +seq_printf (m," %s" ,probe_symbol (tp));for (i =0 ; i < tp->nr_args; i++) { ret =probe_arg_string (buf,MAX_ARGSTR_LEN , &tp->args[i].fetch);
Hi Lai,
Quoted 3 lines · Lai Jiangshan
"symbol_name+0" is not so friendly.
It makes the output longer.
Hmm, I've added +0 just for convenience of parser programs. But anyway, skipping it is not so costly option for them :-)
Acked-by Masami Hiramatsu <[email protected]>
Quoted 37 lines
Signed-off-by Lai Jiangshan <[email protected]>---
kernel/trace/trace_kprobe.c +9
-3@@ -243,7 +243,11 @@ static int probe_arg_string(char *buf, size_t n, struct fetch_func *ff) ret =snprintf (buf, n,"@0x%p" , ff->data); else if (ff->func == fetch_symbol) {struct symbol_cache *sc = ff->data; - ret =snprintf (buf, n,"@%s%+ld" , sc->symbol, sc->offset); +if (sc->offset) + ret =snprintf (buf, n,"@%s%+ld" , sc->symbol, + sc->offset); +else + ret =snprintf (buf, n,"@%s" , sc->symbol); } else if (ff->func == fetch_retvalue) ret =snprintf (buf, n,"$retval" ); else if (ff->func == fetch_stack_address)@@ -760,10 +764,12 @@ static int probes_seq_show(struct seq_file *m, void *v)seq_printf (m,"%c" ,probe_is_return (tp) ?'r' :'p' );seq_printf (m,":%s/%s" , tp->call.system, tp->call.name); -if (tp->symbol) +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);else -seq_printf (m," 0x%p" , tp->rp.kp.addr); +seq_printf (m," %s" ,probe_symbol (tp));for (i =0 ; i < tp->nr_args; i++) { ret =probe_arg_string (buf,MAX_ARGSTR_LEN , &tp->args[i].fetch);
Signature · 7 lines
Masami Hiramatsu Software Engineer Hitachi Computer Products (America), Inc. Software Solutions Division e-mail: [email protected]
[tip:perf/core] trace_kprobes: Don't output zero offset
In reply to Lai JiangshanCommit-ID: 52a11f354970e7301e1d1a029b87535be45abec9 Gitweb: http://git.kernel.org/tip/52a11f354970e7301e1d1a029b87535be45abec9 Author: Lai Jiangshan <[email protected]> AuthorDate: Wed, 25 Nov 2009 16:33:15 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 27 Nov 2009 06:43:05 +0100
trace_kprobes: Don't output zero offset
"symbol_name+0" is not so friendly.
It makes the output longer.
Signed-off-by Lai Jiangshan <[email protected]>
Acked-by Masami Hiramatsu <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Frederic Weisbecker <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- kernel/trace/trace_kprobe.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-)
kernel/trace/trace_kprobe.c +9 -3
@@ -243,7 +243,11 @@ static int probe_arg_string(char *buf, size_t n, struct fetch_func *ff) ret =snprintf (buf, n,"@0x%p" , ff->data); else if (ff->func == fetch_symbol) {struct symbol_cache *sc = ff->data; - ret =snprintf (buf, n,"@%s%+ld" , sc->symbol, sc->offset); +if (sc->offset) + ret =snprintf (buf, n,"@%s%+ld" , sc->symbol, + sc->offset); +else + ret =snprintf (buf, n,"@%s" , sc->symbol); } else if (ff->func == fetch_retvalue) ret =snprintf (buf, n,"$retval" ); else if (ff->func == fetch_stack_address)
@@ -762,10 +766,12 @@ static int probes_seq_show(struct seq_file *m, void *v)seq_printf (m,"%c" ,probe_is_return (tp) ?'r' :'p' );seq_printf (m,":%s/%s" , tp->call.system, tp->call.name); -if (tp->symbol) +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);else -seq_printf (m," 0x%p" , tp->rp.kp.addr); +seq_printf (m," %s" ,probe_symbol (tp));for (i =0 ; i < tp->nr_args; i++) { ret =probe_arg_string (buf,MAX_ARGSTR_LEN , &tp->args[i].fetch);