lkml.org 
[lkml]   [2009]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:tracing/core] ftrace: clean up of using ftrace_event_enable_disable()
    Commit-ID:  0e907c99391362385c8e3af2c43b904dd1fd5d73
    Gitweb: http://git.kernel.org/tip/0e907c99391362385c8e3af2c43b904dd1fd5d73
    Author: Zhaolei <zhaolei@cn.fujitsu.com>
    AuthorDate: Mon, 25 May 2009 18:13:59 +0800
    Committer: Frederic Weisbecker <fweisbec@gmail.com>
    CommitDate: Tue, 26 May 2009 03:30:31 +0200

    ftrace: clean up of using ftrace_event_enable_disable()

    Always use ftrace_event_enable_disable() to enable/disable an event
    so that we can factorize out the event toggling code.

    [ Impact: factorize and cleanup event tracing code ]

    Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Cc: Tom Zanussi <tzanussi@gmail.com>
    LKML-Reference: <4A14FDFE.2080402@cn.fujitsu.com>
    Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>


    ---
    kernel/trace/trace_events.c | 44 +++++++++++++-----------------------------
    1 files changed, 14 insertions(+), 30 deletions(-)

    diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
    index 9b246eb..6c81f9c 100644
    --- a/kernel/trace/trace_events.c
    +++ b/kernel/trace/trace_events.c
    @@ -76,26 +76,9 @@ static void trace_destroy_fields(struct ftrace_event_call *call)

    #endif /* CONFIG_MODULES */

    -static void ftrace_clear_events(void)
    -{
    - struct ftrace_event_call *call;
    -
    - mutex_lock(&event_mutex);
    - list_for_each_entry(call, &ftrace_events, list) {
    -
    - if (call->enabled) {
    - call->enabled = 0;
    - tracing_stop_cmdline_record();
    - call->unregfunc();
    - }
    - }
    - mutex_unlock(&event_mutex);
    -}
    -
    static void ftrace_event_enable_disable(struct ftrace_event_call *call,
    int enable)
    {
    -
    switch (enable) {
    case 0:
    if (call->enabled) {
    @@ -114,6 +97,17 @@ static void ftrace_event_enable_disable(struct ftrace_event_call *call,
    }
    }

    +static void ftrace_clear_events(void)
    +{
    + struct ftrace_event_call *call;
    +
    + mutex_lock(&event_mutex);
    + list_for_each_entry(call, &ftrace_events, list) {
    + ftrace_event_enable_disable(call, 0);
    + }
    + mutex_unlock(&event_mutex);
    +}
    +
    /*
    * __ftrace_set_clr_event(NULL, NULL, NULL, set) will set/unset all events.
    */
    @@ -1059,11 +1053,7 @@ static void trace_module_remove_events(struct module *mod)
    list_for_each_entry_safe(call, p, &ftrace_events, list) {
    if (call->mod == mod) {
    found = true;
    - if (call->enabled) {
    - call->enabled = 0;
    - tracing_stop_cmdline_record();
    - call->unregfunc();
    - }
    + ftrace_event_enable_disable(call, 0);
    if (call->event)
    unregister_ftrace_event(call->event);
    debugfs_remove_recursive(call->dir);
    @@ -1265,15 +1255,9 @@ static __init void event_trace_self_tests(void)
    continue;
    }

    - call->enabled = 1;
    - tracing_start_cmdline_record();
    - call->regfunc();
    -
    + ftrace_event_enable_disable(call, 1);
    event_test_stuff();
    -
    - call->unregfunc();
    - tracing_stop_cmdline_record();
    - call->enabled = 0;
    + ftrace_event_enable_disable(call, 0);

    pr_cont("OK\n");
    }

    \
     
     \ /
      Last update: 2009-05-28 00:41    [W:0.047 / U:123.444 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site