lkml.org 
[lkml]   [2009]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 5/5] tracing: use newline separator for trace options list
    From: Steven Rostedt <srostedt@redhat.com>

    Impact: clean up

    Instead of listing the trace options like:

    # cat /debug/tracing/trace_options
    print-parent nosym-offset nosym-addr noverbose noraw nohex nobin noblock nostacktrace nosched-tree ftrace_printk noftrace_preempt nobranch annotate nouserstacktrace nosym-userobj

    We now list them like:

    # cat /debug/tracing/trace_options
    print-parent
    nosym-offset
    nosym-addr
    noverbose
    noraw
    nohex
    nobin
    noblock
    nostacktrace
    nosched-tree
    ftrace_printk
    noftrace_preempt
    nobranch
    annotate
    nouserstacktrace
    nosym-userobj

    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    ---
    kernel/trace/trace.c | 13 ++++++-------
    1 files changed, 6 insertions(+), 7 deletions(-)

    diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
    index 304e02c..5db7485 100644
    --- a/kernel/trace/trace.c
    +++ b/kernel/trace/trace.c
    @@ -2037,7 +2037,7 @@ tracing_trace_options_read(struct file *filp, char __user *ubuf,
    /* calculate max size */
    for (i = 0; trace_options[i]; i++) {
    len += strlen(trace_options[i]);
    - len += 3; /* "no" and space */
    + len += 3; /* "no" and newline */
    }

    mutex_lock(&trace_types_lock);
    @@ -2050,7 +2050,7 @@ tracing_trace_options_read(struct file *filp, char __user *ubuf,
    */
    for (i = 0; trace_opts[i].name; i++) {
    len += strlen(trace_opts[i].name);
    - len += 3; /* "no" and space */
    + len += 3; /* "no" and newline */
    }

    /* +2 for \n and \0 */
    @@ -2062,22 +2062,21 @@ tracing_trace_options_read(struct file *filp, char __user *ubuf,

    for (i = 0; trace_options[i]; i++) {
    if (trace_flags & (1 << i))
    - r += sprintf(buf + r, "%s ", trace_options[i]);
    + r += sprintf(buf + r, "%s\n", trace_options[i]);
    else
    - r += sprintf(buf + r, "no%s ", trace_options[i]);
    + r += sprintf(buf + r, "no%s\n", trace_options[i]);
    }

    for (i = 0; trace_opts[i].name; i++) {
    if (tracer_flags & trace_opts[i].bit)
    - r += sprintf(buf + r, "%s ",
    + r += sprintf(buf + r, "%s\n",
    trace_opts[i].name);
    else
    - r += sprintf(buf + r, "no%s ",
    + r += sprintf(buf + r, "no%s\n",
    trace_opts[i].name);
    }
    mutex_unlock(&trace_types_lock);

    - r += sprintf(buf + r, "\n");
    WARN_ON(r >= len + 2);

    r = simple_read_from_buffer(ubuf, cnt, ppos, buf, r);
    --
    1.5.6.5
    --


    \
     
     \ /
      Last update: 2009-02-27 06:37    [W:0.025 / U:0.200 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site