Implement shm object table

[lttng-ust.git] / libringbuffer / frontend_types.h

diff --git a/libringbuffer/frontend_types.h b/libringbuffer/frontend_types.h
index d1a3d200be7130076805a2c0ef019b6054bf281f..974f782e0dc86b3ed3903ec861ede6754504fbd9 100644 (file)
--- a/libringbuffer/frontend_types.h
+++ b/libringbuffer/frontend_types.h
@@ -20,14 +20,13 @@
 
 #include <urcu/list.h>
 #include <urcu/uatomic.h>
-#include <urcu/ref.h>
 
 #include "ust/core.h"
 
-#include "usterr_signal_safe.h"
-#include "config.h"
+#include <ust/usterr-signal-safe.h>
+#include <ust/ringbuffer-config.h>
 #include "backend_types.h"
-#include "shm.h"
+#include "shm_internal.h"
 
 /*
  * A switch is done during tracing or as a final flush after tracing (so it
@@ -51,8 +50,6 @@ struct channel {
        unsigned long read_timer_interval;      /* Reader wakeup (jiffies) */
        //wait_queue_head_t read_wait;          /* reader wait queue */
        int finalized;                          /* Has channel been finalized */
-       struct urcu_ref ref;                    /* Reference count */
-       DECLARE_SHMP(struct shm_header, shm_header);
 } ____cacheline_aligned;
 
 /* Per-subbuffer commit counters used on the hot path */