X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ring-buffer-client.h;h=f791cd1eed12ee405f8bfb1aad712dfd680bb680;hb=f0fde1c3984721c0660c7d5a1377db74b6c03a70;hp=ad33673774396cb25fe32097ed90c4ff01b48642;hpb=2a9d9339386426860c1df91d0b8010c87809c84b;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ring-buffer-client.h b/liblttng-ust/lttng-ring-buffer-client.h
index ad336737..f791cd1e 100644
--- a/liblttng-ust/lttng-ring-buffer-client.h
+++ b/liblttng-ust/lttng-ring-buffer-client.h
@@ -64,13 +64,13 @@ struct lttng_client_ctx {
 	size_t event_context_len;
 };
 
-static inline uint64_t lib_ring_buffer_clock_read(struct channel *chan)
+static inline uint64_t lib_ring_buffer_clock_read(struct lttng_ust_lib_ring_buffer_channel *chan)
 {
 	return trace_clock_read64();
 }
 
 static inline
-size_t ctx_get_aligned_size(size_t offset, struct lttng_ctx *ctx,
+size_t ctx_get_aligned_size(size_t offset, struct lttng_ust_ctx *ctx,
 		size_t ctx_len)
 {
 	size_t orig_offset = offset;
@@ -83,7 +83,7 @@ size_t ctx_get_aligned_size(size_t offset, struct lttng_ctx *ctx,
 }
 
 static inline
-void ctx_get_struct_size(struct lttng_ctx *ctx, size_t *ctx_len,
+void ctx_get_struct_size(struct lttng_ust_ctx *ctx, size_t *ctx_len,
 		enum app_ctx_mode mode)
 {
 	int i;
@@ -95,9 +95,9 @@ void ctx_get_struct_size(struct lttng_ctx *ctx, size_t *ctx_len,
 	}
 	for (i = 0; i < ctx->nr_fields; i++) {
 		if (mode == APP_CTX_ENABLED) {
-			offset += ctx->fields[i].get_size(&ctx->fields[i], offset);
+			offset += ctx->fields[i]->get_size(ctx->fields[i], offset);
 		} else {
-			if (lttng_context_is_app(ctx->fields[i].event_field.name)) {
+			if (lttng_context_is_app(ctx->fields[i]->event_field->name)) {
 				/*
 				 * Before UST 2.8, we cannot use the
 				 * application context, because we
@@ -108,9 +108,9 @@ void ctx_get_struct_size(struct lttng_ctx *ctx, size_t *ctx_len,
 				 * concurrently with application context
 				 * register/unregister.
 				 */
-				offset += lttng_ust_dummy_get_size(&ctx->fields[i], offset);
+				offset += lttng_ust_dummy_get_size(ctx->fields[i], offset);
 			} else {
-				offset += ctx->fields[i].get_size(&ctx->fields[i], offset);
+				offset += ctx->fields[i]->get_size(ctx->fields[i], offset);
 			}
 		}
 	}
@@ -120,7 +120,7 @@ void ctx_get_struct_size(struct lttng_ctx *ctx, size_t *ctx_len,
 static inline
 void ctx_record(struct lttng_ust_lib_ring_buffer_ctx *bufctx,
 		struct lttng_channel *chan,
-		struct lttng_ctx *ctx,
+		struct lttng_ust_ctx *ctx,
 		enum app_ctx_mode mode)
 {
 	int i;
@@ -130,9 +130,9 @@ void ctx_record(struct lttng_ust_lib_ring_buffer_ctx *bufctx,
 	lib_ring_buffer_align_ctx(bufctx, ctx->largest_align);
 	for (i = 0; i < ctx->nr_fields; i++) {
 		if (mode == APP_CTX_ENABLED) {
-			ctx->fields[i].record(&ctx->fields[i], bufctx, chan);
+			ctx->fields[i]->record(ctx->fields[i], bufctx, chan);
 		} else {
-			if (lttng_context_is_app(ctx->fields[i].event_field.name)) {
+			if (lttng_context_is_app(ctx->fields[i]->event_field->name)) {
 				/*
 				 * Before UST 2.8, we cannot use the
 				 * application context, because we
@@ -143,9 +143,9 @@ void ctx_record(struct lttng_ust_lib_ring_buffer_ctx *bufctx,
 				 * concurrently with application context
 				 * register/unregister.
 				 */
-				lttng_ust_dummy_record(&ctx->fields[i], bufctx, chan);
+				lttng_ust_dummy_record(ctx->fields[i], bufctx, chan);
 			} else {
-				ctx->fields[i].record(&ctx->fields[i], bufctx, chan);
+				ctx->fields[i]->record(ctx->fields[i], bufctx, chan);
 			}
 		}
 	}
@@ -166,7 +166,8 @@ void ctx_record(struct lttng_ust_lib_ring_buffer_ctx *bufctx,
  */
 static __inline__
 size_t record_header_size(const struct lttng_ust_lib_ring_buffer_config *config,
-				 struct channel *chan, size_t offset,
+				 struct lttng_ust_lib_ring_buffer_channel *chan,
+				 size_t offset,
 				 size_t *pre_header_padding,
 				 struct lttng_ust_lib_ring_buffer_ctx *ctx,
 				 struct lttng_client_ctx *client_ctx)
@@ -357,14 +358,15 @@ void lttng_write_event_header_slow(const struct lttng_ust_lib_ring_buffer_config
 
 static const struct lttng_ust_lib_ring_buffer_config client_config;
 
-static uint64_t client_ring_buffer_clock_read(struct channel *chan)
+static uint64_t client_ring_buffer_clock_read(struct lttng_ust_lib_ring_buffer_channel *chan)
 {
 	return lib_ring_buffer_clock_read(chan);
 }
 
 static
 size_t client_record_header_size(const struct lttng_ust_lib_ring_buffer_config *config,
-				 struct channel *chan, size_t offset,
+				 struct lttng_ust_lib_ring_buffer_channel *chan,
+				 size_t offset,
 				 size_t *pre_header_padding,
 				 struct lttng_ust_lib_ring_buffer_ctx *ctx,
 				 void *client_ctx)
@@ -389,7 +391,7 @@ static void client_buffer_begin(struct lttng_ust_lib_ring_buffer *buf, uint64_t
 				unsigned int subbuf_idx,
 				struct lttng_ust_shm_handle *handle)
 {
-	struct channel *chan = shmp(handle, buf->backend.chan);
+	struct lttng_ust_lib_ring_buffer_channel *chan = shmp(handle, buf->backend.chan);
 	struct packet_header *header =
 		(struct packet_header *)
 			lib_ring_buffer_offset_address(&buf->backend,
@@ -422,7 +424,7 @@ static void client_buffer_end(struct lttng_ust_lib_ring_buffer *buf, uint64_t ts
 			      unsigned int subbuf_idx, unsigned long data_size,
 			      struct lttng_ust_shm_handle *handle)
 {
-	struct channel *chan = shmp(handle, buf->backend.chan);
+	struct lttng_ust_lib_ring_buffer_channel *chan = shmp(handle, buf->backend.chan);
 	struct packet_header *header =
 		(struct packet_header *)
 			lib_ring_buffer_offset_address(&buf->backend,
@@ -544,7 +546,8 @@ static int client_stream_id(struct lttng_ust_lib_ring_buffer *buf,
 		struct lttng_ust_shm_handle *handle,
 		uint64_t *stream_id)
 {
-	struct channel *chan = shmp(handle, buf->backend.chan);
+	struct lttng_ust_lib_ring_buffer_channel *chan = shmp(handle,
+			buf->backend.chan);
 	struct lttng_channel *lttng_chan = channel_get_private(chan);
 
 	*stream_id = lttng_chan->id;
@@ -556,7 +559,7 @@ static int client_current_timestamp(struct lttng_ust_lib_ring_buffer *buf,
 		struct lttng_ust_shm_handle *handle,
 		uint64_t *ts)
 {
-	struct channel *chan;
+	struct lttng_ust_lib_ring_buffer_channel *chan;
 
 	chan = shmp(handle, handle->chan);
 	*ts = client_ring_buffer_clock_read(chan);
@@ -646,33 +649,43 @@ struct lttng_channel *_channel_create(const char *name,
 				const int *stream_fds, int nr_stream_fds,
 				int64_t blocking_timeout)
 {
-	struct lttng_channel chan_priv_init;
+	struct lttng_ust_abi_channel_config chan_priv_init;
 	struct lttng_ust_shm_handle *handle;
 	struct lttng_channel *lttng_chan;
-	void *priv;
+
+	lttng_chan = zmalloc(sizeof(struct lttng_channel));
+	if (!lttng_chan)
+		return NULL;
+	memcpy(lttng_chan->uuid, uuid, LTTNG_UST_UUID_LEN);
+	lttng_chan->id = chan_id;
 
 	memset(&chan_priv_init, 0, sizeof(chan_priv_init));
 	memcpy(chan_priv_init.uuid, uuid, LTTNG_UST_UUID_LEN);
 	chan_priv_init.id = chan_id;
+
 	handle = channel_create(&client_config, name,
-			&priv, __alignof__(struct lttng_channel),
-			sizeof(struct lttng_channel),
+			__alignof__(struct lttng_ust_abi_channel_config),
+			sizeof(struct lttng_ust_abi_channel_config),
 			&chan_priv_init,
-			buf_addr, subbuf_size, num_subbuf,
+			lttng_chan, buf_addr, subbuf_size, num_subbuf,
 			switch_timer_interval, read_timer_interval,
 			stream_fds, nr_stream_fds, blocking_timeout);
 	if (!handle)
-		return NULL;
-	lttng_chan = priv;
+		goto error;
 	lttng_chan->handle = handle;
 	lttng_chan->chan = shmp(handle, handle->chan);
 	return lttng_chan;
+
+error:
+	free(lttng_chan);
+	return NULL;
 }
 
 static
 void lttng_channel_destroy(struct lttng_channel *chan)
 {
 	channel_destroy(chan->chan, chan->handle, 1);
+	free(chan);
 }
 
 static
@@ -746,32 +759,33 @@ void lttng_event_strcpy(struct lttng_ust_lib_ring_buffer_ctx *ctx, const char *s
 
 #if 0
 static
-wait_queue_head_t *lttng_get_reader_wait_queue(struct channel *chan)
+wait_queue_head_t *lttng_get_reader_wait_queue(struct lttng_ust_lib_ring_buffer_channel *chan)
 {
 	return &chan->read_wait;
 }
 
 static
-wait_queue_head_t *lttng_get_hp_wait_queue(struct channel *chan)
+wait_queue_head_t *lttng_get_hp_wait_queue(struct lttng_ust_lib_ring_buffer_channel *chan)
 {
 	return &chan->hp_wait;
 }
 #endif //0
 
 static
-int lttng_is_finalized(struct channel *chan)
+int lttng_is_finalized(struct lttng_ust_lib_ring_buffer_channel *chan)
 {
 	return lib_ring_buffer_channel_is_finalized(chan);
 }
 
 static
-int lttng_is_disabled(struct channel *chan)
+int lttng_is_disabled(struct lttng_ust_lib_ring_buffer_channel *chan)
 {
 	return lib_ring_buffer_channel_is_disabled(chan);
 }
 
 static
-int lttng_flush_buffer(struct channel *chan, struct lttng_ust_shm_handle *handle)
+int lttng_flush_buffer(struct lttng_ust_lib_ring_buffer_channel *chan,
+		struct lttng_ust_shm_handle *handle)
 {
 	struct lttng_ust_lib_ring_buffer *buf;
 	int cpu;
@@ -793,15 +807,18 @@ static struct lttng_transport lttng_relay_transport = {
 	.name = "relay-" RING_BUFFER_MODE_TEMPLATE_STRING "-mmap",
 	.ops = {
 		.struct_size = sizeof(struct lttng_ust_channel_ops),
-		.channel_create = _channel_create,
-		.channel_destroy = lttng_channel_destroy,
+		.priv = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_channel_ops_private, {
+			.pub = &lttng_relay_transport.ops,
+			.channel_create = _channel_create,
+			.channel_destroy = lttng_channel_destroy,
+			.packet_avail_size = NULL,	/* Would be racy anyway */
+			.is_finalized = lttng_is_finalized,
+			.is_disabled = lttng_is_disabled,
+			.flush_buffer = lttng_flush_buffer,
+		}),
 		.event_reserve = lttng_event_reserve,
 		.event_commit = lttng_event_commit,
 		.event_write = lttng_event_write,
-		.packet_avail_size = NULL,	/* Would be racy anyway */
-		.is_finalized = lttng_is_finalized,
-		.is_disabled = lttng_is_disabled,
-		.flush_buffer = lttng_flush_buffer,
 		.event_strcpy = lttng_event_strcpy,
 	},
 	.client_config = &client_config,