Rename shm_handle to lttng_ust_shm_handle

[lttng-ust.git] / libust / ltt-ring-buffer-metadata-client.h

diff --git a/libust/ltt-ring-buffer-metadata-client.h b/libust/ltt-ring-buffer-metadata-client.h
index dd168465655f5a646c8c62f4a3ded71210c03e26..8adf7b6592c6c9bc5e90b7c14e236c7002852c5f 100644 (file)
--- a/libust/ltt-ring-buffer-metadata-client.h
+++ b/libust/ltt-ring-buffer-metadata-client.h
@@ -23,6 +23,8 @@ struct metadata_packet_header {
        uint8_t  compression_scheme;    /* 0 if unused */
        uint8_t  encryption_scheme;     /* 0 if unused */
        uint8_t  checksum_scheme;       /* 0 if unused */
+       uint8_t  major;                 /* CTF spec major version number */
+       uint8_t  minor;                 /* CTF spec minor version number */
        uint8_t  header_end[0];
 };
 
@@ -77,7 +79,7 @@ static size_t client_packet_header_size(void)
 
 static void client_buffer_begin(struct lib_ring_buffer *buf, u64 tsc,
                                unsigned int subbuf_idx,
-                               struct shm_handle *handle)
+                               struct lttng_ust_shm_handle *handle)
 {
        struct channel *chan = shmp(handle, buf->backend.chan);
        struct metadata_packet_header *header =
@@ -96,6 +98,9 @@ static void client_buffer_begin(struct lib_ring_buffer *buf, u64 tsc,
        header->compression_scheme = 0; /* 0 if unused */
        header->encryption_scheme = 0;  /* 0 if unused */
        header->checksum_scheme = 0;    /* 0 if unused */
+       header->major = CTF_SPEC_MAJOR;
+       header->minor = CTF_SPEC_MINOR;
+
 }
 
 /*
@@ -104,7 +109,7 @@ static void client_buffer_begin(struct lib_ring_buffer *buf, u64 tsc,
  */
 static void client_buffer_end(struct lib_ring_buffer *buf, u64 tsc,
                              unsigned int subbuf_idx, unsigned long data_size,
-                             struct shm_handle *handle)
+                             struct lttng_ust_shm_handle *handle)
 {
        struct channel *chan = shmp(handle, buf->backend.chan);
        struct metadata_packet_header *header =
@@ -124,14 +129,14 @@ static void client_buffer_end(struct lib_ring_buffer *buf, u64 tsc,
 
 static int client_buffer_create(struct lib_ring_buffer *buf, void *priv,
                                int cpu, const char *name,
-                               struct shm_handle *handle)
+                               struct lttng_ust_shm_handle *handle)
 {
        return 0;
 }
 
 static void client_buffer_finalize(struct lib_ring_buffer *buf,
                                   void *priv, int cpu,
-                                  struct shm_handle *handle)
+                                  struct lttng_ust_shm_handle *handle)
 {
 }
 
@@ -160,11 +165,14 @@ struct ltt_channel *_channel_create(const char *name,
                                struct ltt_channel *ltt_chan, void *buf_addr,
                                size_t subbuf_size, size_t num_subbuf,
                                unsigned int switch_timer_interval,
-                               unsigned int read_timer_interval)
+                               unsigned int read_timer_interval,
+                               int *shm_fd, int *wait_fd,
+                               uint64_t *memory_map_size)
 {
        ltt_chan->handle = channel_create(&client_config, name, ltt_chan, buf_addr,
                              subbuf_size, num_subbuf, switch_timer_interval,
-                             read_timer_interval);
+                             read_timer_interval, shm_fd, wait_fd,
+                             memory_map_size);
        if (!ltt_chan->handle)
                return NULL;
        ltt_chan->chan = shmp(ltt_chan->handle, ltt_chan->handle->chan);
@@ -174,12 +182,12 @@ struct ltt_channel *_channel_create(const char *name,
 static
 void ltt_channel_destroy(struct ltt_channel *ltt_chan)
 {
-       channel_destroy(ltt_chan->chan, ltt_chan->handle);
+       channel_destroy(ltt_chan->chan, ltt_chan->handle, 0);
 }
 
 static
 struct lib_ring_buffer *ltt_buffer_read_open(struct channel *chan,
-                                            struct shm_handle *handle,
+                                            struct lttng_ust_shm_handle *handle,
                                             int *shm_fd, int *wait_fd,
                                             uint64_t *memory_map_size)
 {
@@ -187,16 +195,16 @@ struct lib_ring_buffer *ltt_buffer_read_open(struct channel *chan,
 
        buf = channel_get_ring_buffer(&client_config, chan,
                        0, handle, shm_fd, wait_fd, memory_map_size);
-       if (!lib_ring_buffer_open_read(buf, handle))
+       if (!lib_ring_buffer_open_read(buf, handle, 0))
                return buf;
        return NULL;
 }
 
 static
 void ltt_buffer_read_close(struct lib_ring_buffer *buf,
-                          struct shm_handle *handle)
+                          struct lttng_ust_shm_handle *handle)
 {
-       lib_ring_buffer_release_read(buf, handle);
+       lib_ring_buffer_release_read(buf, handle, 0);
 }
 
 static
@@ -219,7 +227,7 @@ void ltt_event_write(struct lib_ring_buffer_ctx *ctx, const void *src,
 }
 
 static
-size_t ltt_packet_avail_size(struct channel *chan, struct shm_handle *handle)
+size_t ltt_packet_avail_size(struct channel *chan, struct lttng_ust_shm_handle *handle)
                             
 {
        unsigned long o_begin;
@@ -261,6 +269,21 @@ int ltt_is_disabled(struct channel *chan)
        return lib_ring_buffer_channel_is_disabled(chan);
 }
 
+static
+int ltt_flush_buffer(struct channel *chan, struct lttng_ust_shm_handle *handle)
+{
+       struct lib_ring_buffer *buf;
+       int shm_fd, wait_fd;
+       uint64_t memory_map_size;
+
+       buf = channel_get_ring_buffer(&client_config, chan,
+                       0, handle, &shm_fd, &wait_fd,
+                       &memory_map_size);
+       lib_ring_buffer_switch(&client_config, buf,
+                       SWITCH_ACTIVE, handle);
+       return 0;
+}
+
 static struct ltt_transport ltt_relay_transport = {
        .name = "relay-" RING_BUFFER_MODE_TEMPLATE_STRING "-mmap",
        .ops = {
@@ -276,6 +299,7 @@ static struct ltt_transport ltt_relay_transport = {
                //.get_hp_wait_queue = ltt_get_hp_wait_queue,
                .is_finalized = ltt_is_finalized,
                .is_disabled = ltt_is_disabled,
+               .flush_buffer = ltt_flush_buffer,
        },
 };