aboutsummaryrefslogtreecommitdiff
path: root/kernel/trace/trace.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-05-12 21:20:45 +0200
committerThomas Gleixner <tglx@linutronix.de>2008-05-23 20:41:13 +0200
commit4e3c3333f3bd7eedfd21b1155b3c7cd24fc7f754 (patch)
tree1b53d424c618e646cba8e3a8d6b27b5cec9cb8c2 /kernel/trace/trace.h
parent77a2b37d227483fe52aead242652aee406c25bf0 (diff)
ftrace: fix time offset
fix time offset calculations and ordering, plus make code more consistent. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/trace/trace.h')
-rw-r--r--kernel/trace/trace.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index cc1d34b8b77..5df8ff2b84a 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -56,6 +56,8 @@ struct trace_array_cpu {
void *trace_current;
struct list_head trace_pages;
atomic_t disabled;
+ cycle_t time_offset;
+
/* these fields get copied into max-trace: */
unsigned trace_current_idx;
unsigned long trace_idx;
@@ -114,14 +116,19 @@ struct tracer {
struct trace_iterator {
struct trace_array *tr;
struct tracer *trace;
+
struct trace_entry *ent;
+ int cpu;
+
+ struct trace_entry *prev_ent;
+ int prev_cpu;
+
unsigned long iter_flags;
loff_t pos;
unsigned long next_idx[NR_CPUS];
struct list_head *next_page[NR_CPUS];
unsigned next_page_idx[NR_CPUS];
long idx;
- int cpu;
};
void notrace tracing_reset(struct trace_array_cpu *data);