oprofile: simplify add_ibs_begin()

[safe/jmp/linux-2.6] / drivers / oprofile / cpu_buffer.h

diff --git a/drivers/oprofile/cpu_buffer.h b/drivers/oprofile/cpu_buffer.h
index c66c025..cd28abc 100644 (file)
--- a/drivers/oprofile/cpu_buffer.h
+++ b/drivers/oprofile/cpu_buffer.h
@@ -14,9 +14,11 @@
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
 #include <linux/cache.h>
- 
+#include <linux/sched.h>
+#include <linux/ring_buffer.h>
+
 struct task_struct;
- 
+
 int alloc_cpu_buffers(void);
 void free_cpu_buffers(void);
 
@@ -30,29 +32,53 @@ struct op_sample {
        unsigned long eip;
        unsigned long event;
 };
- 
+
+struct op_entry {
+       struct ring_buffer_event *event;
+       struct op_sample *sample;
+       unsigned long irq_flags;
+};
+
 struct oprofile_cpu_buffer {
        volatile unsigned long head_pos;
        volatile unsigned long tail_pos;
        unsigned long buffer_size;
-       struct task_struct * last_task;
+       struct task_struct *last_task;
        int last_is_kernel;
        int tracing;
-       struct op_sample * buffer;
        unsigned long sample_received;
        unsigned long sample_lost_overflow;
        unsigned long backtrace_aborted;
        unsigned long sample_invalid_eip;
        int cpu;
        struct delayed_work work;
-} ____cacheline_aligned;
+};
+
+DECLARE_PER_CPU(struct oprofile_cpu_buffer, cpu_buffer);
+
+/*
+ * Resets the cpu buffer to a sane state.
+ *
+ * reset these to invalid values; the next sample collected will
+ * populate the buffer with proper values to initialize the buffer
+ */
+static inline void op_cpu_buffer_reset(int cpu)
+{
+       struct oprofile_cpu_buffer *cpu_buf = &per_cpu(cpu_buffer, cpu);
 
-extern struct oprofile_cpu_buffer cpu_buffer[];
+       cpu_buf->last_is_kernel = -1;
+       cpu_buf->last_task = NULL;
+}
 
-void cpu_buffer_reset(struct oprofile_cpu_buffer * cpu_buf);
+int op_cpu_buffer_write_entry(struct op_entry *entry);
+int op_cpu_buffer_write_commit(struct op_entry *entry);
+struct op_sample *op_cpu_buffer_read_entry(int cpu);
+unsigned long op_cpu_buffer_entries(int cpu);
 
 /* transient events for the CPU buffer -> event buffer */
 #define CPU_IS_KERNEL 1
 #define CPU_TRACE_BEGIN 2
+#define IBS_FETCH_BEGIN 3
+#define IBS_OP_BEGIN    4
 
 #endif /* OPROFILE_CPU_BUFFER_H */