Note find_ust_app_context must be called with RCU read lock

[lttng-tools.git] / src / bin / lttng-sessiond / ust-app.c

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 5ebe9917a049bc9ae43ee01fbc6348d2fed2c609..132bde1bd8943053da78aa5dddc3224bbf9f1d71 100644 (file)
--- 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