projects / lttng-modules.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix: kernels 3.0.x do not implement IS_ENABLED macro
[lttng-modules.git] / src / lttng-syscalls.c
diff --git a/src/lttng-syscalls.c b/src/lttng-syscalls.c
index 4cb3616fac2cceb56356ebb86530242ef14bc49b..bf1f2b732217397cf3e489bdb3e5f260f24dc361 100644 (file)
--- a/src/lttng-syscalls.c
+++ b/src/lttng-syscalls.c
@@ -132,9 +132,6 @@ 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)
 {
@@ -571,9 +568,9 @@ void lttng_syscall_event_enabler_create_event(struct lttng_event_enabler_common
                if (!event_recorder_enabler)
                        return;
                event = _lttng_kernel_event_create(&event_recorder_enabler->parent, desc);
-               WARN_ON_ONCE(!event || IS_ERR(event));
+               WARN_ON_ONCE(IS_ERR(event));
                lttng_event_enabler_destroy(&event_recorder_enabler->parent);
-               if (!event || IS_ERR(event)) {
+               if (IS_ERR(event)) {
                        printk(KERN_INFO "Unable to create event recorder %s\n", desc->event_name);
                        return;
                }
@@ -621,9 +618,9 @@ void lttng_syscall_event_enabler_create_event(struct lttng_event_enabler_common
                                &event_notifier_param, syscall_event_notifier_enabler->group);
                WARN_ON_ONCE(!event_notifier_enabler);
                event = _lttng_kernel_event_create(&event_notifier_enabler->parent, desc);
-               WARN_ON_ONCE(!event || IS_ERR(event));
+               WARN_ON_ONCE(IS_ERR(event));
                lttng_event_enabler_destroy(&event_notifier_enabler->parent);
-               if (!event || IS_ERR(event)) {
+               if (IS_ERR(event)) {
                        printk(KERN_INFO "Unable to create event notifier %s\n", desc->event_name);
                        return;
                }
@@ -645,14 +642,15 @@ void lttng_syscall_event_enabler_create_matching_syscall_table_events(struct ltt
        const struct lttng_kernel_event_desc *desc;
        unsigned int i;
 
-       if (!IS_ENABLED(CONFIG_COMPAT) && (type == SC_TYPE_COMPAT_ENTRY || type == SC_TYPE_COMPAT_EXIT))
+#ifndef CONFIG_COMPAT
+       if (type == SC_TYPE_COMPAT_ENTRY || type == SC_TYPE_COMPAT_EXIT)
                return;
-
+#endif
        /* iterate over all syscall and create event that match */
        for (i = 0; i < table_len; i++) {
                struct lttng_kernel_event_common_private *event_priv;
                struct hlist_head *head;
-               int found = 0;
+               bool found = false;
 
                desc = table[i].desc;
                if (!desc) {
@@ -668,8 +666,10 @@ void lttng_syscall_event_enabler_create_matching_syscall_table_events(struct ltt
                 */
                head = utils_borrow_hash_table_bucket(events_ht->table, LTTNG_EVENT_HT_SIZE, desc->event_name);
                lttng_hlist_for_each_entry(event_priv, head, hlist_node) {
-                       if (lttng_event_enabler_desc_match_event(syscall_event_enabler_common, desc, event_priv->pub))
-                               found = 1;
+                       if (lttng_event_enabler_desc_match_event(syscall_event_enabler_common, desc, event_priv->pub)) {
+                               found = true;
+                               break;
+                       }
                }
                if (found)
                        continue;
@@ -703,9 +703,10 @@ void create_unknown_syscall_event(struct lttng_event_enabler_common *event_enabl
        bool found = false;
        struct hlist_head *head;
 
-       if (!IS_ENABLED(CONFIG_COMPAT) && (type == SC_TYPE_COMPAT_ENTRY || type == SC_TYPE_COMPAT_EXIT))
+#ifndef CONFIG_COMPAT
+       if (type == SC_TYPE_COMPAT_ENTRY || type == SC_TYPE_COMPAT_EXIT)
                return;
-
+#endif
        /*
         * Considering that currently system calls can only be enabled on a per
         * name basis (or wildcard based on a name), unknown syscall events are
@@ -744,36 +745,37 @@ void create_unknown_syscall_event(struct lttng_event_enabler_common *event_enabl
         */
        head = utils_borrow_hash_table_bucket(events_ht->table, LTTNG_EVENT_HT_SIZE, desc->event_name);
        lttng_hlist_for_each_entry(event_priv, head, hlist_node) {
-               if (lttng_event_enabler_desc_match_event(event_enabler, desc, event_priv->pub))
+               if (lttng_event_enabler_desc_match_event(event_enabler, desc, event_priv->pub)) {
                        found = true;
+                       break;
+               }
        }
        if (!found)
                lttng_syscall_event_enabler_create_event(event_enabler, desc, unknown_dispatch_list, type, -1U);
 }
 
 static
-int lttng_syscalls_populate_events(struct lttng_event_enabler_common *syscall_event_enabler)
+void lttng_syscall_event_enabler_create_matching_events(struct lttng_event_enabler_common *event_enabler)
 {
-       struct lttng_event_recorder_enabler *event_recorder_enabler;
-       struct lttng_kernel_channel_buffer *chan;
-       int ret;
-
-       if (syscall_event_enabler->enabler_type != LTTNG_EVENT_ENABLER_TYPE_RECORDER)
-               return 0;
-       event_recorder_enabler = container_of(syscall_event_enabler, struct lttng_event_recorder_enabler, parent);
-       chan = event_recorder_enabler->chan;
-
-       lttng_syscall_event_enabler_create_matching_syscall_table_events(&event_recorder_enabler->parent, sc_table.table, sc_table.len, SC_TYPE_ENTRY);
-       lttng_syscall_event_enabler_create_matching_syscall_table_events(&event_recorder_enabler->parent, sc_exit_table.table, sc_exit_table.len, SC_TYPE_EXIT);
-       create_unknown_syscall_event(syscall_event_enabler, SC_TYPE_ENTRY);
-       create_unknown_syscall_event(syscall_event_enabler, SC_TYPE_EXIT);
+       enum lttng_kernel_abi_syscall_entryexit entryexit = event_enabler->event_param.u.syscall.entryexit;
 
-       lttng_syscall_event_enabler_create_matching_syscall_table_events(&event_recorder_enabler->parent, compat_sc_table.table, compat_sc_table.len, SC_TYPE_COMPAT_ENTRY);
-       lttng_syscall_event_enabler_create_matching_syscall_table_events(&event_recorder_enabler->parent, compat_sc_exit_table.table, compat_sc_exit_table.len, SC_TYPE_COMPAT_EXIT);
-       create_unknown_syscall_event(syscall_event_enabler, SC_TYPE_COMPAT_ENTRY);
-       create_unknown_syscall_event(syscall_event_enabler, SC_TYPE_COMPAT_EXIT);
+       if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) {
+               lttng_syscall_event_enabler_create_matching_syscall_table_events(event_enabler,
+                       sc_table.table, sc_table.len, SC_TYPE_ENTRY);
+               lttng_syscall_event_enabler_create_matching_syscall_table_events(event_enabler,
+                       compat_sc_table.table, compat_sc_table.len, SC_TYPE_COMPAT_ENTRY);
+               create_unknown_syscall_event(event_enabler, SC_TYPE_ENTRY);
+               create_unknown_syscall_event(event_enabler, SC_TYPE_COMPAT_ENTRY);
+       }
 
-       return ret;
+       if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) {
+               lttng_syscall_event_enabler_create_matching_syscall_table_events(event_enabler,
+                       sc_exit_table.table, sc_exit_table.len, SC_TYPE_EXIT);
+               lttng_syscall_event_enabler_create_matching_syscall_table_events(event_enabler,
+                       compat_sc_exit_table.table, compat_sc_exit_table.len, SC_TYPE_COMPAT_EXIT);
+               create_unknown_syscall_event(event_enabler, SC_TYPE_EXIT);
+               create_unknown_syscall_event(event_enabler, SC_TYPE_COMPAT_EXIT);
+       }
 }
 
 /*
@@ -819,14 +821,6 @@ int lttng_event_enabler_create_syscall_events_if_missing(struct lttng_event_enab
                        return -ENOMEM;
        }
 
-       ret = lttng_syscalls_populate_events(syscall_event_enabler);
-       if (ret)
-               return ret;
-
-       ret = lttng_syscalls_create_matching_event_notifiers(syscall_event_enabler);
-       if (ret)
-               return ret;
-
        if (!syscall_table->sys_enter_registered) {
                ret = lttng_wrapper_tracepoint_probe_register("sys_enter",
                                (void *) syscall_entry_event_probe, syscall_table);
@@ -845,38 +839,8 @@ int lttng_event_enabler_create_syscall_events_if_missing(struct lttng_event_enab
                syscall_table->sys_exit_registered = 1;
        }
 
-       return ret;
-}
-
-static
-int lttng_syscalls_create_matching_event_notifiers(struct lttng_event_enabler_common *event_enabler)
-{
-       int ret;
-       enum lttng_kernel_abi_syscall_entryexit 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);
+       lttng_syscall_event_enabler_create_matching_events(syscall_event_enabler);
 
-       if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) {
-               lttng_syscall_event_enabler_create_matching_syscall_table_events(&event_notifier_enabler->parent,
-                       sc_table.table, sc_table.len, SC_TYPE_ENTRY);
-               lttng_syscall_event_enabler_create_matching_syscall_table_events(&event_notifier_enabler->parent,
-                       compat_sc_table.table, compat_sc_table.len, SC_TYPE_COMPAT_ENTRY);
-               create_unknown_syscall_event(event_enabler, SC_TYPE_ENTRY);
-               create_unknown_syscall_event(event_enabler, SC_TYPE_COMPAT_ENTRY);
-       }
-
-       if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) {
-               lttng_syscall_event_enabler_create_matching_syscall_table_events(&event_notifier_enabler->parent,
-                       sc_exit_table.table, sc_exit_table.len, SC_TYPE_EXIT);
-               lttng_syscall_event_enabler_create_matching_syscall_table_events(&event_notifier_enabler->parent,
-                       compat_sc_exit_table.table, compat_sc_exit_table.len, SC_TYPE_COMPAT_EXIT);
-               create_unknown_syscall_event(event_enabler, SC_TYPE_EXIT);
-               create_unknown_syscall_event(event_enabler, SC_TYPE_COMPAT_EXIT);
-       }
        return ret;
 }
 
LTTng 2.0/0.x modules
This page took 0.026132 seconds and 4 git commands to generate.