Move LTTng-UST buffer ownership from application to consumer

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

diff --git a/libringbuffer/frontend_types.h b/libringbuffer/frontend_types.h
index 37fabad39c5b87b019ba2a55c8621592dfa7efa3..9d3932d8978d51b17f64c87af472c675e6472824 100644 (file)
--- a/libringbuffer/frontend_types.h
+++ b/libringbuffer/frontend_types.h
@@ -46,7 +46,7 @@
 enum switch_mode { SWITCH_ACTIVE, SWITCH_FLUSH };
 
 /* channel: collection of per-cpu ring buffers. */
-#define RB_CHANNEL_PADDING     64
+#define RB_CHANNEL_PADDING             32
 struct channel {
        int record_disabled;
        unsigned long commit_count_mask;        /*
@@ -61,12 +61,13 @@ struct channel {
        //wait_queue_head_t read_wait;          /* reader wait queue */
        int finalized;                          /* Has channel been finalized */
        size_t priv_data_offset;
+       unsigned int nr_streams;                /* Number of streams */
+       char padding[RB_CHANNEL_PADDING];
        /*
         * Associated backend contains a variable-length array. Needs to
         * be last member.
         */
        struct channel_backend backend;         /* Associated backend */
-       char padding[RB_CHANNEL_PADDING];
 } __attribute__((aligned(CAA_CACHE_LINE_SIZE)));
 
 /* Per-subbuffer commit counters used on the hot path */
@@ -109,7 +110,6 @@ struct lttng_ust_lib_ring_buffer {
                                         * Active readers count
                                         * standard atomic access (shared)
                                         */
-       long active_shadow_readers;
                                        /* Dropped records */
        union v_atomic records_lost_full;       /* Buffer full */
        union v_atomic records_lost_wrap;       /* Nested wrap-around */