Fix: Correctly handle the command to disable all events

[lttng-ust.git] / include / lttng / ringbuffer-config.h

diff --git a/include/lttng/ringbuffer-config.h b/include/lttng/ringbuffer-config.h
index 3b7d348aa8b2d0e1f8b5be0ea00039ea13fa5e2d..87344c94c8285f94b296f318ae58880dedcc7a39 100644 (file)
--- a/include/lttng/ringbuffer-config.h
+++ b/include/lttng/ringbuffer-config.h
@@ -92,6 +92,13 @@ struct lttng_ust_lib_ring_buffer_client_cb {
                            size_t offset, size_t *header_len,
                            size_t *payload_len, uint64_t *timestamp,
                            struct lttng_ust_shm_handle *handle);
+       /*
+        * Offset and size of content size field in client.
+        */
+       void (*content_size_field) (const struct lttng_ust_lib_ring_buffer_config *config,
+                               size_t *offset, size_t *length);
+       void (*packet_size_field) (const struct lttng_ust_lib_ring_buffer_config *config,
+                               size_t *offset, size_t *length);
 };
 
 /*
@@ -133,7 +140,7 @@ struct lttng_ust_lib_ring_buffer_client_cb {
  * RING_BUFFER_WAKEUP_NONE does not perform any wakeup whatsoever. The client
  * has the responsibility to perform wakeups.
  */
-#define LTTNG_UST_RING_BUFFER_CONFIG_PADDING   32
+#define LTTNG_UST_RING_BUFFER_CONFIG_PADDING   20
 
 enum lttng_ust_lib_ring_buffer_alloc_types {
        RING_BUFFER_ALLOC_PER_CPU,
@@ -146,8 +153,8 @@ enum lttng_ust_lib_ring_buffer_sync_types {
 };
 
 enum lttng_ust_lib_ring_buffer_mode_types {
-       RING_BUFFER_OVERWRITE,          /* Overwrite when buffer full */
-       RING_BUFFER_DISCARD,            /* Discard when buffer full */
+       RING_BUFFER_OVERWRITE = 0,      /* Overwrite when buffer full */
+       RING_BUFFER_DISCARD = 1,        /* Discard when buffer full */
 };
 
 enum lttng_ust_lib_ring_buffer_output_types {
@@ -204,6 +211,8 @@ struct lttng_ust_lib_ring_buffer_config {
         * callbacks and update the cb pointers.
         */
        int client_type;
+       int _unused1;
+       const struct lttng_ust_lib_ring_buffer_client_cb *cb_ptr;
        char padding[LTTNG_UST_RING_BUFFER_CONFIG_PADDING];
 };