move libkcompat inside ust

[ust.git] / libust / channels.h

diff --git a/libust/channels.h b/libust/channels.h
index 893d8c1193b544c35ff063cbb06e1a37f3de9a7d..e92e6cced4b31c119927757c317899d2f860487d 100644 (file)
--- a/libust/channels.h
+++ b/libust/channels.h
@@ -25,18 +25,19 @@
 #include <errno.h>
 
 #include <ust/kernelcompat.h>
-#include <kcompat/kref.h>
 
 #define EVENTS_PER_CHANNEL     65536
+#define MAX_CPUS               32
 
-struct ltt_trace_struct;
+struct ust_trace;
 
 struct ust_buffer;
 
 struct ust_channel {
        /* First 32 bytes cache-hot cacheline */
-       struct ltt_trace_struct *trace;
-       void *buf;
+       struct ust_trace *trace;
+       int *buf_struct_shmids;
+       struct ust_buffer **buf;
        int overwrite:1;
        int active:1;
        unsigned int n_subbufs_order;
@@ -48,25 +49,12 @@ struct ust_channel {
                                                 */
        /* End of first 32 bytes cacheline */
 
-       /*
-        * buffer_begin - called on buffer-switch to a new sub-buffer
-        * @buf: the channel buffer containing the new sub-buffer
-        */
-       void (*buffer_begin) (struct ust_buffer *buf,
-                       u64 tsc, unsigned int subbuf_idx);
-       /*
-        * buffer_end - called on buffer-switch to a new sub-buffer
-        * @buf: the channel buffer containing the previous sub-buffer
-        */
-       void (*buffer_end) (struct ust_buffer *buf,
-                       u64 tsc, unsigned int offset, unsigned int subbuf_idx);
        struct kref kref;       /* Channel transport reference count */
        size_t subbuf_size;
        int subbuf_size_order;
        unsigned int subbuf_cnt;
        const char *channel_name;
-
-       int buf_shmid;
+       int n_cpus;
 
        u32 version;
        size_t alloc_size;