diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2010-06-24 17:52:23 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2010-06-24 17:52:23 -0400 |
| commit | e1d44628a0ddd8a1352535a3d3eaee514a4e1e0f (patch) | |
| tree | 5132235b78696b8f2bc25de73f9961acb3b57838 | |
| parent | db6800824bfadc2a026610de7f311a363f3efd4a (diff) | |
trace-cmd: Load the default ftrace print handlers before plugins
Load the ftrace function print handlers before loading the plugins.
This allows for a loaded plugin to override one of the ftrace default
output functions.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
| -rw-r--r-- | trace-input.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/trace-input.c b/trace-input.c index 815d250..398d0f9 100644 --- a/trace-input.c +++ b/trace-input.c | |||
| @@ -479,9 +479,6 @@ int tracecmd_read_headers(struct tracecmd_input *handle) | |||
| 479 | if (ret < 0) | 479 | if (ret < 0) |
| 480 | return -1; | 480 | return -1; |
| 481 | 481 | ||
| 482 | /* register default ftrace functions first */ | ||
| 483 | tracecmd_ftrace_overrides(handle); | ||
| 484 | |||
| 485 | return 0; | 482 | return 0; |
| 486 | } | 483 | } |
| 487 | 484 | ||
| @@ -1978,6 +1975,9 @@ struct tracecmd_input *tracecmd_alloc_fd(int fd) | |||
| 1978 | if (!handle->pevent) | 1975 | if (!handle->pevent) |
| 1979 | goto failed_read; | 1976 | goto failed_read; |
| 1980 | 1977 | ||
| 1978 | /* register default ftrace functions first */ | ||
| 1979 | tracecmd_ftrace_overrides(handle); | ||
| 1980 | |||
| 1981 | handle->plugin_list = tracecmd_load_plugins(handle->pevent); | 1981 | handle->plugin_list = tracecmd_load_plugins(handle->pevent); |
| 1982 | 1982 | ||
| 1983 | handle->pevent->file_bigendian = buf[0]; | 1983 | handle->pevent->file_bigendian = buf[0]; |
