lkml.org 
[lkml]   [2013]   [Jun]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 01/11] tracing: simplify event_enable_read()
(2013/06/21 3:31), Tom Zanussi wrote:
> Rather than enumerating each permutation, build the enable state
> string up from the combination of states. This also allows for the
> simpler addition of more states.
>
> Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>

Looks nicer for me :)

Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>

Thanks,

> ---
> kernel/trace/trace_events.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
> index 27963e2..ecb2609 100644
> --- a/kernel/trace/trace_events.c
> +++ b/kernel/trace/trace_events.c
> @@ -624,17 +624,17 @@ event_enable_read(struct file *filp, char __user *ubuf, size_t cnt,
> loff_t *ppos)
> {
> struct ftrace_event_file *file = filp->private_data;
> - char *buf;
> + char buf[4] = "0";
>
> - if (file->flags & FTRACE_EVENT_FL_ENABLED) {
> - if (file->flags & FTRACE_EVENT_FL_SOFT_DISABLED)
> - buf = "0*\n";
> - else if (file->flags & FTRACE_EVENT_FL_SOFT_MODE)
> - buf = "1*\n";
> - else
> - buf = "1\n";
> - } else
> - buf = "0\n";
> + if (file->flags & FTRACE_EVENT_FL_ENABLED &&
> + !(file->flags & FTRACE_EVENT_FL_SOFT_DISABLED))
> + strcpy(buf, "1");
> +
> + if (file->flags & FTRACE_EVENT_FL_SOFT_DISABLED ||
> + file->flags & FTRACE_EVENT_FL_SOFT_MODE)
> + strcat(buf, "*");
> +
> + strcat(buf, "\n");
>
> return simple_read_from_buffer(ubuf, cnt, ppos, buf, strlen(buf));
> }
>


--
Masami HIRAMATSU
IT Management Research Dept. Linux Technology Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: masami.hiramatsu.pt@hitachi.com




\
 
 \ /
  Last update: 2013-06-21 09:41    [W:0.167 / U:0.324 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site