diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2015-09-30 15:42:05 +0200 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2015-09-30 21:22:55 +0200 |
| commit | 983f938ae69585213bbb779d841b90e75f93f545 (patch) | |
| tree | b7d592e16b741e612031e91f032ed97b440fc107 /kernel/trace/trace.h | |
| parent | tracing: Move sleep-time and graph-time options out of the core trace_flags (diff) | |
| download | linux-983f938ae69585213bbb779d841b90e75f93f545.tar.xz linux-983f938ae69585213bbb779d841b90e75f93f545.zip | |
tracing: Move trace_flags from global to a trace_array field
In preparation to make trace options per instance, the global trace_flags
needs to be moved from being a global variable to a field within the trace
instance trace_array structure.
There's still more work to do, as there's some functions that use
trace_flags without passing in a way to get to the current_trace array. For
those, the global_trace is used directly (from trace.c). This includes
setting and clearing the trace_flags. This means that when a new instance is
created, it just gets the trace_flags of the global_trace and will not be
able to modify them. Depending on the functions that have access to the
trace_array, the flags of an instance may not affect parts of its trace,
where the global_trace is used. These will be fixed in future changes.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/trace.h')
| -rw-r--r-- | kernel/trace/trace.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 5219bf5f708a..eda4e6f8159b 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -217,6 +217,7 @@ struct trace_array { int stop_count; int clock_id; struct tracer *current_trace; + unsigned int trace_flags; unsigned int flags; raw_spinlock_t start_lock; struct dentry *dir; @@ -698,8 +699,6 @@ int trace_array_printk_buf(struct ring_buffer *buffer, void trace_printk_seq(struct trace_seq *s); enum print_line_t print_trace_line(struct trace_iterator *iter); -extern unsigned long trace_flags; - extern char trace_find_mark(unsigned long long duration); /* Standard output formatting function used for function return traces */ @@ -994,7 +993,7 @@ extern int enable_branch_tracing(struct trace_array *tr); extern void disable_branch_tracing(void); static inline int trace_branch_enable(struct trace_array *tr) { - if (trace_flags & TRACE_ITER_BRANCH) + if (tr->trace_flags & TRACE_ITER_BRANCH) return enable_branch_tracing(tr); return 0; } |