X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-abi.c;h=61105ace6dccd9d83e00865454e7580252b21199;hb=6ba6fd60507f8e045bdc4f1be14e9d99c6a15f7f;hp=af2a47dcb5269ac8ec478a75fa18afdfd63fbd2a;hpb=9daacd1a32798bcef31f13cf45a3aab25bdc67af;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index af2a47dc..61105ace 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->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;
 }
@@ -322,7 +323,7 @@ objd_error:
 }
 
 static
-long lttng_abi_tracer_version(int objd,
+long lttng_abi_tracer_version(int objd __attribute__((unused)),
 	struct lttng_ust_abi_tracer_version *v)
 {
 	v->major = LTTNG_UST_MAJOR_VERSION;
@@ -376,7 +377,7 @@ fd_error:
 }
 
 static
-long lttng_abi_add_context(int objd,
+long lttng_abi_add_context(int objd __attribute__((unused)),
 	struct lttng_ust_abi_context *context_param,
 	union lttng_ust_abi_args *uargs,
 	struct lttng_ust_ctx **ctx, struct lttng_ust_session *session)
@@ -554,10 +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;
-	lttng_chan_buf->handle = channel_handle;
 
 	memcpy(&chan->backend.config,
 		transport->client_config,
@@ -714,7 +714,8 @@ objd_error:
 
 static
 long lttng_event_notifier_enabler_cmd(int objd, unsigned int cmd, unsigned long arg,
-		union lttng_ust_abi_args *uargs, void *owner)
+		union lttng_ust_abi_args *uargs __attribute__((unused)),
+		void *owner __attribute__((unused)))
 {
 	struct lttng_event_notifier_enabler *event_notifier_enabler = objd_private(objd);
 	switch (cmd) {
@@ -755,7 +756,7 @@ long lttng_event_notifier_enabler_cmd(int objd, unsigned int cmd, unsigned long
  */
 static
 long lttng_event_notifier_group_error_counter_cmd(int objd, unsigned int cmd, unsigned long arg,
-	union lttng_ust_abi_args *uargs, void *owner)
+	union lttng_ust_abi_args *uargs, void *owner __attribute__((unused)))
 {
 	int ret;
 	struct lttng_counter *counter = objd_private(objd);
@@ -785,7 +786,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);
@@ -955,7 +957,8 @@ static const struct lttng_ust_abi_objd_ops lttng_event_notifier_group_ops = {
 
 static
 long lttng_tracepoint_list_cmd(int objd, unsigned int cmd, unsigned long arg,
-	union lttng_ust_abi_args *uargs, void *owner)
+	union lttng_ust_abi_args *uargs __attribute__((unused)),
+	void *owner __attribute__((unused)))
 {
 	struct lttng_ust_tracepoint_list *list = objd_private(objd);
 	struct lttng_ust_abi_tracepoint_iter *tp =
@@ -1035,7 +1038,8 @@ static const struct lttng_ust_abi_objd_ops lttng_tracepoint_list_ops = {
 
 static
 long lttng_tracepoint_field_list_cmd(int objd, unsigned int cmd,
-	unsigned long arg, union lttng_ust_abi_args *uargs, void *owner)
+	unsigned long arg __attribute__((unused)), union lttng_ust_abi_args *uargs,
+	void *owner __attribute__((unused)))
 {
 	struct lttng_ust_field_list *list = objd_private(objd);
 	struct lttng_ust_abi_field_iter *tp = &uargs->field_list.entry;
@@ -1115,12 +1119,12 @@ static const struct lttng_ust_abi_objd_ops lttng_tracepoint_field_list_ops = {
 
 static
 int lttng_abi_map_stream(int channel_objd, struct lttng_ust_abi_stream *info,
-		union lttng_ust_abi_args *uargs, void *owner)
+		union lttng_ust_abi_args *uargs, void *owner __attribute__((unused)))
 {
 	struct lttng_ust_channel_buffer *lttng_chan_buf = objd_private(channel_objd);
 	int ret;
 
-	ret = channel_handle_add_stream(lttng_chan_buf->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)
@@ -1251,8 +1255,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->handle);
+		return lttng_chan_buf->ops->priv->flush_buffer(lttng_chan_buf);
 	default:
 		return -EINVAL;
 	}
@@ -1297,7 +1300,8 @@ static const struct lttng_ust_abi_objd_ops lttng_channel_ops = {
  */
 static
 long lttng_event_enabler_cmd(int objd, unsigned int cmd, unsigned long arg,
-	union lttng_ust_abi_args *uargs, void *owner)
+	union lttng_ust_abi_args *uargs __attribute__((unused)),
+	void *owner __attribute__((unused)))
 {
 	struct lttng_event_enabler *enabler = objd_private(objd);