X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ring-buffer-metadata-client.h;fp=liblttng-ust%2Flttng-ring-buffer-metadata-client.h;h=956de9fde1c62215dd7df343e743d44486fca40e;hb=f0fde1c3984721c0660c7d5a1377db74b6c03a70;hp=2b2aae7dc9920b5a5ce56e9401d3831450ce1cfa;hpb=9f5ade14faf36df6429d9c6e1d0360854a5669d0;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ring-buffer-metadata-client.h b/liblttng-ust/lttng-ring-buffer-metadata-client.h
index 2b2aae7d..956de9fd 100644
--- a/liblttng-ust/lttng-ring-buffer-metadata-client.h
+++ b/liblttng-ust/lttng-ring-buffer-metadata-client.h
@@ -200,33 +200,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),
+			__alignof__(struct lttng_channel),
 			sizeof(struct lttng_channel),
 			&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