X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=891d75f7c000b287a5707e702ef04a972f398ac3;hb=d00b982bd5afb45511b9ca6e0a94e7b148518705;hp=5ebe9917a049bc9ae43ee01fbc6348d2fed2c609;hpb=6a6b20683ccf29e16baceef5d29357001c2c713a;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 5ebe9917a..891d75f7c 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <errno.h>
 #include <inttypes.h>
 #include <pthread.h>
@@ -1446,11 +1447,15 @@ int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess,
 	}
 
 	/* If event not enabled, disable it on the tracer */
-	if (ua_event->enabled == 0) {
-		ret = disable_ust_event(app, ua_sess, ua_event);
+	if (ua_event->enabled) {
+		/*
+		 * We now need to explicitly enable the event, since it
+		 * is now disabled at creation.
+		 */
+		ret = enable_ust_event(app, ua_sess, ua_event);
 		if (ret < 0) {
 			/*
-			 * If we hit an EPERM, something is wrong with our disable call. If
+			 * If we hit an EPERM, something is wrong with our enable call. If
 			 * we get an EEXIST, there is a problem on the tracer side since we
 			 * just created it.
 			 */
@@ -1964,6 +1969,7 @@ no_match:
 /*
  * Lookup for an ust app context from an lttng_ust_context.
  *
+ * Must be called while holding RCU read side lock.
  * Return an ust_app_ctx object or NULL on error.
  */
 static
@@ -5146,10 +5152,12 @@ unsigned int ust_app_get_nb_stream(struct ltt_ust_session *usess)
 		cds_list_for_each_entry(reg, &usess->buffer_reg_uid_list, lnode) {
 			struct buffer_reg_channel *reg_chan;
 
+			rcu_read_lock();
 			cds_lfht_for_each_entry(reg->registry->channels->ht, &iter.iter,
 					reg_chan, node.node) {
 				ret += reg_chan->stream_count;
 			}
+			rcu_read_unlock();
 		}
 		break;
 	}