X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-abi.c;h=b399722515c57b7b5a7c4e8ce6f32d034a37de53;hb=1d18d519668cd559dcafa1f18113edceb2418ed0;hp=323e6a22672ae6b0edd12ae15658872dab8c74fe;hpb=3b5babf8592ca27acaf01fca24406922fc5cc89c;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index 323e6a22..b3997225 100644
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -39,6 +39,7 @@
 #include <usterr-signal-safe.h>
 
 #include "../libringbuffer/frontend_types.h"
+#include "../libringbuffer/frontend.h"
 #include "../libringbuffer/shm.h"
 #include "../libcounter/counter.h"
 #include "tracepoint-internal.h"
@@ -292,8 +293,8 @@ int lttng_is_channel_ready(struct lttng_ust_channel_buffer *lttng_chan)
 	struct lttng_ust_lib_ring_buffer_channel *chan;
 	unsigned int nr_streams, exp_streams;
 
-	chan = lttng_chan->chan;
-	nr_streams = channel_handle_get_nr_streams(lttng_chan->chan->handle);
+	chan = lttng_chan->priv->rb_chan;
+	nr_streams = channel_handle_get_nr_streams(lttng_chan->priv->rb_chan->handle);
 	exp_streams = chan->nr_streams;
 	return nr_streams == exp_streams;
 }
@@ -554,9 +555,9 @@ int lttng_abi_map_channel(int session_objd,
 
 	lttng_chan_buf->priv->parent.tstate = 1;
 	lttng_chan_buf->priv->ctx = NULL;
+	lttng_chan_buf->priv->rb_chan = chan;
 
 	lttng_chan_buf->ops = &transport->ops;
-	lttng_chan_buf->chan = chan;
 
 	memcpy(&chan->backend.config,
 		transport->client_config,
@@ -784,7 +785,8 @@ long lttng_event_notifier_group_error_counter_cmd(int objd, unsigned int cmd, un
 	return ret;
 }
 
-__attribute__((visibility("hidden")))
+int lttng_release_event_notifier_group_error_counter(int objd)
+	__attribute__((visibility("hidden")));
 int lttng_release_event_notifier_group_error_counter(int objd)
 {
 	struct lttng_counter *counter = objd_private(objd);
@@ -1119,7 +1121,7 @@ int lttng_abi_map_stream(int channel_objd, struct lttng_ust_abi_stream *info,
 	struct lttng_ust_channel_buffer *lttng_chan_buf = objd_private(channel_objd);
 	int ret;
 
-	ret = channel_handle_add_stream(lttng_chan_buf->chan->handle,
+	ret = channel_handle_add_stream(lttng_chan_buf->priv->rb_chan->handle,
 		uargs->stream.shm_fd, uargs->stream.wakeup_fd,
 		info->stream_nr, info->len);
 	if (ret)
@@ -1250,8 +1252,7 @@ long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg,
 	case LTTNG_UST_ABI_DISABLE:
 		return lttng_channel_disable(lttng_chan_buf->parent);
 	case LTTNG_UST_ABI_FLUSH_BUFFER:
-		return lttng_chan_buf->ops->priv->flush_buffer(lttng_chan_buf->chan,
-				lttng_chan_buf->chan->handle);
+		return lttng_chan_buf->ops->priv->flush_buffer(lttng_chan_buf);
 	default:
 		return -EINVAL;
 	}