Rename shm_handle to lttng_ust_shm_handle

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

diff --git a/libust/ltt-ring-buffer-client.h b/libust/ltt-ring-buffer-client.h
index f3a1a27aaca49629e5831de7b3a2156993f68cd3..f4911e8e8654d462dcd989a3c89e198a971615d0 100644 (file)
--- a/libust/ltt-ring-buffer-client.h
+++ b/libust/ltt-ring-buffer-client.h
@@ -198,6 +198,7 @@ void ltt_write_event_header(const struct lib_ring_buffer_config *config,
 
        ctx_record(ctx, ltt_chan, ltt_chan->ctx);
        ctx_record(ctx, ltt_chan, event->ctx);
+       lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
 
        return;
 
@@ -261,6 +262,7 @@ void ltt_write_event_header_slow(const struct lib_ring_buffer_config *config,
        }
        ctx_record(ctx, ltt_chan, ltt_chan->ctx);
        ctx_record(ctx, ltt_chan, event->ctx);
+       lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
 }
 
 static const struct lib_ring_buffer_config client_config;
@@ -294,7 +296,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 packet_header *header =
@@ -322,7 +324,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 packet_header *header =
@@ -346,12 +348,12 @@ 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)
+                               int cpu, const char *name, 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)
+static void client_buffer_finalize(struct lib_ring_buffer *buf, void *priv, int cpu, struct lttng_ust_shm_handle *handle)
 {
 }
 
@@ -397,12 +399,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)
 {
@@ -413,7 +415,7 @@ struct lib_ring_buffer *ltt_buffer_read_open(struct channel *chan,
                buf = channel_get_ring_buffer(&client_config, chan,
                                cpu, 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;
@@ -421,9 +423,9 @@ struct lib_ring_buffer *ltt_buffer_read_open(struct channel *chan,
 
 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
@@ -501,6 +503,25 @@ 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 cpu;
+
+       for_each_channel_cpu(cpu, chan) {
+               int shm_fd, wait_fd;
+               uint64_t memory_map_size;
+
+               buf = channel_get_ring_buffer(&client_config, chan,
+                               cpu, 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 = {
@@ -516,6 +537,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,
        },
 };