X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-abi.c;h=4fbf15c6543aeb55faf8e433eb2a9fedd6fdc9f3;hb=6548fca464f68be5ded73be6b9a479daf08e62d6;hp=a852aaef99752789ee66cb6a017485c8604e43b6;hpb=34a91bdb42a2a3b01b687ab5e1ba7638401e6dfc;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index a852aaef..4fbf15c6 100644
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -37,6 +37,7 @@
  *     - Takes instrumentation source specific arguments.
  */
 
+#define _LGPL_SOURCE
 #include <lttng/ust-abi.h>
 #include <lttng/ust-error.h>
 #include <urcu/compiler.h>
@@ -44,6 +45,7 @@
 #include <lttng/ust-events.h>
 #include <lttng/ust-version.h>
 #include <lttng/tracepoint.h>
+#include <ust-fd.h>
 #include "tracepoint-internal.h"
 #include <usterr-signal-safe.h>
 #include <helper.h>
@@ -185,6 +187,7 @@ static
 void objd_ref(int id)
 {
 	struct lttng_ust_obj *obj = _objd_get(id);
+	assert(obj != NULL);
 	obj->u.s.f_count++;
 }
 
@@ -334,9 +337,10 @@ long lttng_abi_tracer_version(int objd,
 static
 long lttng_abi_add_context(int objd,
 	struct lttng_ust_context *context_param,
+	union ust_args *uargs,
 	struct lttng_ctx **ctx, struct lttng_session *session)
 {
-	return lttng_attach_context(context_param, ctx, session);
+	return lttng_attach_context(context_param, uargs, ctx, session);
 }
 
 /**
@@ -466,8 +470,6 @@ int lttng_abi_map_channel(int session_objd,
 		chan_name = "channel";
 		break;
 	default:
-		transport_name = "<unknown>";
-		chan_name = "<unknown>";
 		ret = -EINVAL;
 		goto notransport;
 	}
@@ -513,7 +515,6 @@ int lttng_abi_map_channel(int session_objd,
 	/* error path after channel was created */
 objd_error:
 notransport:
-	free(lttng_chan);
 alloc_error:
 	channel_destroy(chan, channel_handle, 0);
 	return ret;
@@ -528,7 +529,9 @@ invalid:
 	{
 		int close_ret;
 
+		lttng_ust_lock_fd_tracker();
 		close_ret = close(wakeup_fd);
+		lttng_ust_unlock_fd_tracker();
 		if (close_ret) {
 			PERROR("close");
 		}
@@ -573,6 +576,8 @@ long lttng_session_cmd(int objd, unsigned int cmd, unsigned long arg,
 	case LTTNG_UST_SESSION_STOP:
 	case LTTNG_UST_DISABLE:
 		return lttng_session_disable(session);
+	case LTTNG_UST_SESSION_STATEDUMP:
+		return lttng_session_statedump(session);
 	default:
 		return -EINVAL;
 	}
@@ -886,7 +891,7 @@ long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg,
 	}
 	case LTTNG_UST_CONTEXT:
 		return lttng_abi_add_context(objd,
-				(struct lttng_ust_context *) arg,
+				(struct lttng_ust_context *) arg, uargs,
 				&channel->ctx, channel->session);
 	case LTTNG_UST_ENABLE:
 		return lttng_channel_enable(channel);
@@ -933,6 +938,8 @@ static const struct lttng_ust_objd_ops lttng_channel_ops = {
  *		Disable recording for this enabler
  *	LTTNG_UST_FILTER
  *		Attach a filter to an enabler.
+ *	LTTNG_UST_EXCLUSION
+ *		Attach exclusions to an enabler.
  */
 static
 long lttng_enabler_cmd(int objd, unsigned int cmd, unsigned long arg,
@@ -958,6 +965,11 @@ long lttng_enabler_cmd(int objd, unsigned int cmd, unsigned long arg,
 			return ret;
 		return 0;
 	}
+	case LTTNG_UST_EXCLUSION:
+	{
+		return lttng_enabler_attach_exclusion(enabler,
+				(struct lttng_ust_excluder_node *) arg);
+	}
 	default:
 		return -EINVAL;
 	}
@@ -981,6 +993,8 @@ static const struct lttng_ust_objd_ops lttng_enabler_ops = {
 void lttng_ust_abi_exit(void)
 {
 	lttng_ust_abi_close_in_progress = 1;
+	ust_lock_nocheck();
 	objd_table_destroy();
+	ust_unlock();
 	lttng_ust_abi_close_in_progress = 0;
 }