X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Flttng-ring-buffer-client.h;h=0be36aa2d932793c43bce1fc5d955acbe11b714c;hb=3b5babf8592ca27acaf01fca24406922fc5cc89c;hp=84457f0a04d97ee5c1e48873b3a1a07b45cc358c;hpb=14b6f89117234871ef9f750c4d282975397e30b7;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ring-buffer-client.h b/liblttng-ust/lttng-ring-buffer-client.h
index 84457f0a..0be36aa2 100644
--- a/liblttng-ust/lttng-ring-buffer-client.h
+++ b/liblttng-ust/lttng-ring-buffer-client.h
@@ -675,7 +675,6 @@ struct lttng_ust_channel_buffer *_channel_create(const char *name,
 			stream_fds, nr_stream_fds, blocking_timeout);
 	if (!handle)
 		goto error;
-	lttng_chan_buf->handle = handle;
 	lttng_chan_buf->chan = shmp(handle, handle->chan);
 	return lttng_chan_buf;
 
@@ -687,7 +686,7 @@ error:
 static
 void lttng_channel_destroy(struct lttng_ust_channel_buffer *lttng_chan_buf)
 {
-	channel_destroy(lttng_chan_buf->chan, lttng_chan_buf->handle, 1);
+	channel_destroy(lttng_chan_buf->chan, lttng_chan_buf->chan->handle, 1);
 	lttng_ust_free_channel_common(lttng_chan_buf->parent);
 }
 
@@ -699,7 +698,7 @@ int lttng_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx,
 	struct lttng_ust_stack_ctx *lttng_ctx = ctx->priv;
 	struct lttng_ust_event_recorder *event_recorder = lttng_ctx->event_recorder;
 	struct lttng_client_ctx client_ctx;
-	int ret, cpu;
+	int ret;
 
 	client_ctx.chan_ctx = lttng_ust_rcu_dereference(lttng_chan->priv->ctx);
 	client_ctx.event_ctx = lttng_ust_rcu_dereference(event_recorder->priv->ctx);
@@ -709,10 +708,8 @@ int lttng_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx,
 	ctx_get_struct_size(client_ctx.event_ctx, &client_ctx.event_context_len,
 			APP_CTX_ENABLED);
 
-	cpu = lib_ring_buffer_get_cpu(&client_config);
-	if (cpu < 0)
+	if (lib_ring_buffer_nesting_inc(&client_config) < 0)
 		return -EPERM;
-	ctx->cpu = cpu;
 
 	switch (lttng_chan->priv->header_type) {
 	case 1:	/* compact */
@@ -738,7 +735,7 @@ int lttng_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx,
 	lttng_write_event_header(&client_config, ctx, &client_ctx, event_id);
 	return 0;
 put:
-	lib_ring_buffer_put_cpu(&client_config);
+	lib_ring_buffer_nesting_dec(&client_config);
 	return ret;
 }
 
@@ -746,7 +743,7 @@ static
 void lttng_event_commit(struct lttng_ust_lib_ring_buffer_ctx *ctx)
 {
 	lib_ring_buffer_commit(&client_config, ctx);
-	lib_ring_buffer_put_cpu(&client_config);
+	lib_ring_buffer_nesting_dec(&client_config);
 }
 
 static
@@ -764,10 +761,10 @@ void lttng_event_strcpy(struct lttng_ust_lib_ring_buffer_ctx *ctx, const char *s
 }
 
 static
-void lttng_event_strcpy_pad(struct lttng_ust_lib_ring_buffer_ctx *ctx,
+void lttng_event_pstrcpy_pad(struct lttng_ust_lib_ring_buffer_ctx *ctx,
 		     const char *src, size_t len)
 {
-	lib_ring_buffer_strcpy(&client_config, ctx, src, len, '\0');
+	lib_ring_buffer_pstrcpy(&client_config, ctx, src, len, '\0');
 }
 
 #if 0
@@ -833,7 +830,7 @@ static struct lttng_transport lttng_relay_transport = {
 		.event_commit = lttng_event_commit,
 		.event_write = lttng_event_write,
 		.event_strcpy = lttng_event_strcpy,
-		.event_strcpy_pad = lttng_event_strcpy_pad,
+		.event_pstrcpy_pad = lttng_event_pstrcpy_pad,
 	},
 	.client_config = &client_config,
 };