projects / lttng-modules.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Refactoring: combine hlist_node into common event structure
[lttng-modules.git] / src / lttng-syscalls.c
diff --git a/src/lttng-syscalls.c b/src/lttng-syscalls.c
index 9739513b0e37b45df5256efbc5ed18426edaaef9..7fa6d7e517299924ac98d792c1ea7a760e8b9c9f 100644 (file)
--- a/src/lttng-syscalls.c
+++ b/src/lttng-syscalls.c
@@ -132,6 +132,9 @@ struct lttng_syscall_filter {
        DECLARE_BITMAP(sc_compat_exit, NR_compat_syscalls);
 };
 
+static
+int lttng_syscalls_create_matching_event_notifiers(struct lttng_event_enabler_common *event_enabler);
+
 static void syscall_entry_event_unknown(struct hlist_head *unknown_action_list_head,
        struct pt_regs *regs, long id)
 {
@@ -543,8 +546,8 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl
                const struct lttng_kernel_event_desc *desc = table[i].desc;
                struct lttng_event_recorder_enabler *event_enabler;
                struct lttng_kernel_abi_event ev;
-               struct lttng_kernel_event_recorder_private *event_recorder_priv;
                struct lttng_kernel_event_recorder *event_recorder;
+               struct lttng_kernel_event_common_private *event_priv;
                struct hlist_head *head;
                bool found = false;
 
@@ -561,9 +564,9 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl
                head = utils_borrow_hash_table_bucket(
                        session->priv->events_ht.table, LTTNG_EVENT_HT_SIZE,
                        desc->event_name);
-               lttng_hlist_for_each_entry(event_recorder_priv, head, hlist) {
-                       if (event_recorder_priv->parent.desc == desc
-                               && get_syscall_table_from_event(event_recorder_priv->parent.pub) == syscall_table)
+               lttng_hlist_for_each_entry(event_priv, head, hlist_node) {
+                       if (event_priv->desc == desc
+                               && get_syscall_table_from_event(event_priv->pub) == syscall_table)
                                found = true;
                }
                if (found)
@@ -816,6 +819,11 @@ int lttng_syscalls_register_event(struct lttng_event_enabler_common *syscall_eve
                }
                syscall_table->sys_exit_registered = 1;
        }
+
+       ret = lttng_syscalls_create_matching_event_notifiers(syscall_event_enabler);
+       if (ret)
+               return ret;
+
        return ret;
 }
 
@@ -824,7 +832,7 @@ int create_unknown_event_notifier(
                struct lttng_event_notifier_enabler *event_notifier_enabler,
                enum sc_type type)
 {
-       struct lttng_kernel_event_notifier_private *event_notifier_priv;
+       struct lttng_kernel_event_common_private *event_priv;
        struct lttng_kernel_event_notifier *event_notifier;
        const struct lttng_kernel_event_desc *desc;
        struct lttng_event_notifier_group *group = event_notifier_enabler->group;
@@ -873,11 +881,11 @@ int create_unknown_event_notifier(
        /*
         * Check if already created.
         */
-       head = utils_borrow_hash_table_bucket(group->event_notifiers_ht.table,
-               LTTNG_EVENT_NOTIFIER_HT_SIZE, desc->event_name);
-       lttng_hlist_for_each_entry(event_notifier_priv, head, hlist) {
-               if (event_notifier_priv->parent.desc == desc &&
-                               event_notifier_priv->parent.user_token == base_enabler->user_token)
+       head = utils_borrow_hash_table_bucket(group->events_ht.table,
+               LTTNG_EVENT_HT_SIZE, desc->event_name);
+       lttng_hlist_for_each_entry(event_priv, head, hlist_node) {
+               if (event_priv->desc == desc &&
+                               event_priv->user_token == base_enabler->user_token)
                        found = true;
        }
        if (found)
@@ -890,12 +898,16 @@ int create_unknown_event_notifier(
        event_notifier_param.event.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
 
        event_notifier_param.event.instrumentation = LTTNG_KERNEL_ABI_SYSCALL;
+       event_notifier_param.event.token = user_token;
        event_notifier_param.event.u.syscall.abi = abi;
        event_notifier_param.event.u.syscall.entryexit = entryexit;
+       event_notifier_param.error_counter_index = error_counter_index;
 
-       event_notifier = _lttng_event_notifier_create(desc, user_token,
-               error_counter_index, group, &event_notifier_param,
-               event_notifier_param.event.instrumentation);
+       event_notifier_enabler = lttng_event_notifier_enabler_create(LTTNG_ENABLER_FORMAT_NAME,
+                       &event_notifier_param, group);
+       WARN_ON_ONCE(!event_notifier_enabler);
+       event_notifier = _lttng_event_notifier_create(event_notifier_enabler, desc);
+       lttng_event_enabler_destroy(&event_notifier_enabler->parent);
        if (IS_ERR(event_notifier)) {
                printk(KERN_INFO "Unable to create unknown notifier %s\n",
                        desc->event_name);
@@ -910,20 +922,21 @@ end:
 }
 
 static int create_matching_event_notifiers(
-               struct lttng_event_notifier_enabler *event_notifier_enabler,
+               struct lttng_event_notifier_enabler *syscall_event_notifier_enabler,
                const struct trace_syscall_entry *table,
                size_t table_len, enum sc_type type)
 {
-       struct lttng_event_notifier_group *group = event_notifier_enabler->group;
+       struct lttng_event_notifier_group *group = syscall_event_notifier_enabler->group;
        const struct lttng_kernel_event_desc *desc;
-       uint64_t user_token = event_notifier_enabler->parent.user_token;
-       uint64_t error_counter_index = event_notifier_enabler->error_counter_index;
+       uint64_t user_token = syscall_event_notifier_enabler->parent.user_token;
+       uint64_t error_counter_index = syscall_event_notifier_enabler->error_counter_index;
        unsigned int i;
        int ret = 0;
 
        /* iterate over all syscall and create event_notifier that match */
        for (i = 0; i < table_len; i++) {
-               struct lttng_kernel_event_notifier_private *event_notifier_priv;
+               struct lttng_event_notifier_enabler *event_notifier_enabler;
+               struct lttng_kernel_event_common_private *event_priv;
                struct lttng_kernel_event_notifier *event_notifier;
                struct lttng_kernel_abi_event_notifier event_notifier_param;
                struct hlist_head *head;
@@ -936,17 +949,17 @@ static int create_matching_event_notifiers(
                }
 
                if (!lttng_desc_match_enabler(desc,
-                               lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)))
+                               lttng_event_notifier_enabler_as_enabler(syscall_event_notifier_enabler)))
                        continue;
 
                /*
                 * Check if already created.
                 */
-               head = utils_borrow_hash_table_bucket(group->event_notifiers_ht.table,
-                       LTTNG_EVENT_NOTIFIER_HT_SIZE, desc->event_name);
-               lttng_hlist_for_each_entry(event_notifier_priv, head, hlist) {
-                       if (event_notifier_priv->parent.desc == desc
-                               && event_notifier_priv->parent.user_token == event_notifier_enabler->parent.user_token)
+               head = utils_borrow_hash_table_bucket(group->events_ht.table,
+                       LTTNG_EVENT_HT_SIZE, desc->event_name);
+               lttng_hlist_for_each_entry(event_priv, head, hlist_node) {
+                       if (event_priv->desc == desc
+                               && event_priv->user_token == syscall_event_notifier_enabler->parent.user_token)
                                found = 1;
                }
                if (found)
@@ -975,10 +988,14 @@ static int create_matching_event_notifiers(
                        LTTNG_KERNEL_ABI_SYM_NAME_LEN - strlen(event_notifier_param.event.name) - 1);
                event_notifier_param.event.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
                event_notifier_param.event.instrumentation = LTTNG_KERNEL_ABI_SYSCALL;
-
-               event_notifier = _lttng_event_notifier_create(desc, user_token,
-                       error_counter_index, group, &event_notifier_param,
-                       event_notifier_param.event.instrumentation);
+               event_notifier_param.event.token = user_token;
+               event_notifier_param.error_counter_index = error_counter_index;
+
+               event_notifier_enabler = lttng_event_notifier_enabler_create(LTTNG_ENABLER_FORMAT_NAME,
+                               &event_notifier_param, group);
+               WARN_ON_ONCE(!event_notifier_enabler);
+               event_notifier = _lttng_event_notifier_create(event_notifier_enabler, desc);
+               lttng_event_enabler_destroy(&event_notifier_enabler->parent);
                if (IS_ERR(event_notifier)) {
                        printk(KERN_INFO "Unable to create event_notifier %s\n",
                                desc->event_name);
@@ -994,14 +1011,17 @@ end:
 
 }
 
-int lttng_syscalls_create_matching_event_notifiers(
-               struct lttng_event_notifier_enabler *event_notifier_enabler)
+static
+int lttng_syscalls_create_matching_event_notifiers(struct lttng_event_enabler_common *event_enabler)
 {
        int ret;
-       struct lttng_event_enabler_common *base_enabler =
-                       lttng_event_notifier_enabler_as_enabler(event_notifier_enabler);
        enum lttng_kernel_abi_syscall_entryexit entryexit =
-                       base_enabler->event_param.u.syscall.entryexit;
+                       event_enabler->event_param.u.syscall.entryexit;
+       struct lttng_event_notifier_enabler *event_notifier_enabler;
+
+       if (event_enabler->enabler_type != LTTNG_EVENT_ENABLER_TYPE_NOTIFIER)
+               return 0;
+       event_notifier_enabler = container_of(event_enabler, struct lttng_event_notifier_enabler, parent);
 
        if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) {
                ret = create_matching_event_notifiers(event_notifier_enabler,
LTTng 2.0/0.x modules
This page took 0.026647 seconds and 4 git commands to generate.