Refactoring: combine common code into lttng_event_enabler_attach_exclusion

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I2a04f627b114f0220eed2369441fc22891604d1a

diff --git a/src/lib/lttng-ust/events.h b/src/lib/lttng-ust/events.h
index 0f56f9409717fa29ac5aaf9e6aef730a1a43d452..7b2b42b63d36326a72f7c0f45f0298d59d881336 100644 (file)
--- a/src/lib/lttng-ust/events.h
+++ b/src/lib/lttng-ust/events.h
@@ -73,10 +73,10 @@ int lttng_event_enabler_attach_context(struct lttng_event_enabler_session_common
        __attribute__((visibility("hidden")));
 
 /*
- * Attach exclusion list to `struct lttng_event_enabler` and all
+ * Attach exclusion list to `struct lttng_event_enabler_common` and all
  * events related to this enabler.
  */
-int lttng_event_enabler_attach_exclusion(struct lttng_event_enabler_session_common *enabler,
+int lttng_event_enabler_attach_exclusion(struct lttng_event_enabler_common *enabler,
                struct lttng_ust_excluder_node **excluder)
        __attribute__((visibility("hidden")));
 
@@ -130,15 +130,6 @@ int lttng_event_notifier_enabler_attach_capture_bytecode(
                struct lttng_ust_bytecode_node **bytecode)
        __attribute__((visibility("hidden")));
 
-/*
- * Attach exclusion list to `struct lttng_event_notifier_enabler` and all
- * event notifiers related to this enabler.
- */
-int lttng_event_notifier_enabler_attach_exclusion(
-               struct lttng_event_notifier_enabler *event_notifier_enabler,
-               struct lttng_ust_excluder_node **excluder)
-       __attribute__((visibility("hidden")));
-
 void lttng_free_event_filter_runtime(struct lttng_ust_event_common *event)
        __attribute__((visibility("hidden")));
 

diff --git a/src/lib/lttng-ust/lttng-events.c b/src/lib/lttng-ust/lttng-events.c
index 396ac9a06ce28d1f8f963743c7a2fa450a72b97f..ccbf5114d33b9f8f07bf9bd4eaa35f09595945ec 100644 (file)
--- a/src/lib/lttng-ust/lttng-events.c
+++ b/src/lib/lttng-ust/lttng-events.c
@@ -1819,22 +1819,14 @@ int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler_common
        return 0;
 }
 
-static
-void _lttng_enabler_attach_exclusion(struct lttng_event_enabler_common *enabler,
+int lttng_event_enabler_attach_exclusion(struct lttng_event_enabler_common *event_enabler,
                struct lttng_ust_excluder_node **excluder)
 {
-       (*excluder)->enabler = enabler;
-       cds_list_add_tail(&(*excluder)->node, &enabler->excluder_head);
+       (*excluder)->enabler = event_enabler;
+       cds_list_add_tail(&(*excluder)->node, &event_enabler->excluder_head);
        /* Take ownership of excluder */
        *excluder = NULL;
-}
-
-int lttng_event_enabler_attach_exclusion(struct lttng_event_enabler_session_common *event_enabler,
-               struct lttng_ust_excluder_node **excluder)
-{
-       _lttng_enabler_attach_exclusion(&event_enabler->parent, excluder);
-
-       lttng_session_lazy_sync_event_enablers(event_enabler->chan->session);
+       lttng_event_enabler_sync(event_enabler);
        return 0;
 }
 
@@ -1854,18 +1846,6 @@ int lttng_event_notifier_enabler_attach_capture_bytecode(
        return 0;
 }
 
-int lttng_event_notifier_enabler_attach_exclusion(
-               struct lttng_event_notifier_enabler *event_notifier_enabler,
-               struct lttng_ust_excluder_node **excluder)
-{
-       _lttng_enabler_attach_exclusion(
-               lttng_event_notifier_enabler_as_enabler(event_notifier_enabler),
-               excluder);
-
-       lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group);
-       return 0;
-}
-
 int lttng_attach_context(struct lttng_ust_abi_context *context_param,
                union lttng_ust_abi_args *uargs,
                struct lttng_ust_ctx **ctx, struct lttng_ust_session *session)

diff --git a/src/lib/lttng-ust/lttng-ust-abi.c b/src/lib/lttng-ust/lttng-ust-abi.c
index b10541ab345308c3ae3bb48ded3f71313ba56b01..63e21f21cd3b0f0f1fdf0fdac818aea12a1b65a9 100644 (file)
--- a/src/lib/lttng-ust/lttng-ust-abi.c
+++ b/src/lib/lttng-ust/lttng-ust-abi.c
@@ -862,7 +862,7 @@ long lttng_event_notifier_enabler_cmd(int objd, unsigned int cmd, unsigned long
                        &event_notifier_enabler->parent,
                        (struct lttng_ust_bytecode_node **) arg);
        case LTTNG_UST_ABI_EXCLUSION:
-               return lttng_event_notifier_enabler_attach_exclusion(event_notifier_enabler,
+               return lttng_event_enabler_attach_exclusion(&event_notifier_enabler->parent,
                        (struct lttng_ust_excluder_node **) arg);
        case LTTNG_UST_ABI_CAPTURE:
                return lttng_event_notifier_enabler_attach_capture_bytecode(
@@ -1784,7 +1784,7 @@ long lttng_event_enabler_cmd(int objd, unsigned int cmd, unsigned long arg,
        }
        case LTTNG_UST_ABI_EXCLUSION:
        {
-               return lttng_event_enabler_attach_exclusion(enabler,
+               return lttng_event_enabler_attach_exclusion(&enabler->parent,
                                (struct lttng_ust_excluder_node **) arg);
        }
        default: