cleanup: convenience libs at root of 'src/common/'

[lttng-ust.git] / src / liblttng-ust / lttng-events.c

diff --git a/src/liblttng-ust/lttng-events.c b/src/liblttng-ust/lttng-events.c
index b61a2293f4a8a83039f3a645da09e9fb60cab479..d5e088495cf57c49b09527524caa4c9e8e765b9a 100644 (file)
--- a/src/liblttng-ust/lttng-events.c
+++ b/src/liblttng-ust/lttng-events.c
@@ -32,15 +32,14 @@
 #include <lttng/tracepoint.h>
 #include <lttng/ust-events.h>
 
-#include <usterr-signal-safe.h>
-#include <ust-helper.h>
+#include "common/logging.h"
+#include "common/macros.h"
 #include <lttng/ust-ctl.h>
-#include <ust-comm.h>
-#include <ust-fd.h>
-#include <ust-dynamic-type.h>
-#include <ust-context-provider.h>
+#include "common/ustcomm.h"
+#include "common/ust-fd.h"
+#include "common/dynamic-type.h"
+#include "common/ust-context-provider.h"
 #include "error.h"
-#include "compat.h"
 #include "lttng-ust-uuid.h"
 
 #include "tracepoint-internal.h"
@@ -52,10 +51,10 @@
 #include "context-internal.h"
 #include "ust-events-internal.h"
 #include "wait.h"
-#include "../libringbuffer/shm.h"
-#include "../libringbuffer/frontend_types.h"
-#include "../libringbuffer/frontend.h"
-#include "../libcounter/counter.h"
+#include "common/ringbuffer/shm.h"
+#include "common/ringbuffer/frontend_types.h"
+#include "common/ringbuffer/frontend.h"
+#include "common/counter/counter.h"
 #include "jhash.h"
 #include <lttng/ust-abi.h>
 #include "context-provider-internal.h"
@@ -379,7 +378,7 @@ void lttng_event_notifier_group_destroy(
        lttng_ust_unlock_fd_tracker();
 
        cds_list_del(&event_notifier_group->node);
-
+       lttng_destroy_context(event_notifier_group->ctx);
        free(event_notifier_group);
 }