Refactoring: uprobes: combine common code between recorder and notifier

[lttng-modules.git] / src / lttng-events.c

diff --git a/src/lttng-events.c b/src/lttng-events.c
index bed65028a912fff796d2cf5a00c411780b926ecc..d5f8314c5fbbe59ea9834b37809de658971032c0 100644 (file)
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -360,7 +360,7 @@ void lttng_session_destroy(struct lttng_kernel_session *session)
        mutex_lock(&sessions_mutex);
        WRITE_ONCE(session->active, 0);
        list_for_each_entry(chan_priv, &session->priv->chan, node) {
-               ret = lttng_syscalls_unregister_channel(chan_priv->pub);
+               ret = lttng_syscalls_unregister_syscall_table(&chan_priv->parent.syscall_table);
                WARN_ON(ret);
        }
        list_for_each_entry(event_recorder_priv, &session->priv->events, node) {
@@ -369,7 +369,7 @@ void lttng_session_destroy(struct lttng_kernel_session *session)
        }
        synchronize_trace();    /* Wait for in-flight events to complete */
        list_for_each_entry(chan_priv, &session->priv->chan, node) {
-               ret = lttng_syscalls_destroy_channel(chan_priv->pub);
+               ret = lttng_syscalls_destroy_syscall_table(&chan_priv->parent.syscall_table);
                WARN_ON(ret);
        }
        list_for_each_entry_safe(event_recorder_enabler, tmp_event_recorder_enabler,
@@ -410,7 +410,7 @@ void lttng_event_notifier_group_destroy(
 
        mutex_lock(&sessions_mutex);
 
-       ret = lttng_syscalls_unregister_event_notifier_group(event_notifier_group);
+       ret = lttng_syscalls_unregister_syscall_table(&event_notifier_group->syscall_table);
        WARN_ON(ret);
 
        list_for_each_entry_safe(event_notifier_priv, tmpevent_notifier_priv,
@@ -424,7 +424,8 @@ void lttng_event_notifier_group_destroy(
 
        irq_work_sync(&event_notifier_group->wakeup_pending);
 
-       kfree(event_notifier_group->syscall_table.sc_filter);
+       ret = lttng_syscalls_destroy_syscall_table(&event_notifier_group->syscall_table);
+       WARN_ON(ret);
 
        list_for_each_entry_safe(event_notifier_enabler, tmp_event_notifier_enabler,
                        &event_notifier_group->enablers_head, node)
@@ -765,7 +766,7 @@ end:
        return ret;
 }
 
-struct lttng_kernel_channel_buffer *lttng_channel_create(struct lttng_kernel_session *session,
+struct lttng_kernel_channel_buffer *lttng_channel_buffer_create(struct lttng_kernel_session *session,
                                       const char *transport_name,
                                       void *buf_addr,
                                       size_t subbuf_size, size_t num_subbuf,
@@ -1113,7 +1114,7 @@ struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct l
 
                ret = lttng_uprobes_register_event(event_param->name,
                                event_param->u.uprobe.fd,
-                               event_recorder);
+                               &event_recorder->parent);
                if (ret)
                        goto register_error;
                ret = try_module_get(event_recorder->priv->parent.desc->owner);
@@ -1320,10 +1321,9 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create(
                 */
                smp_wmb();
 
-               ret = lttng_uprobes_register_event_notifier(
-                               event_notifier_param->event.name,
+               ret = lttng_uprobes_register_event(event_notifier_param->event.name,
                                event_notifier_param->event.u.uprobe.fd,
-                               event_notifier);
+                               &event_notifier->parent);
                if (ret)
                        goto register_error;
                ret = try_module_get(event_notifier->priv->parent.desc->owner);
@@ -1451,11 +1451,11 @@ void register_event_recorder(struct lttng_kernel_event_recorder *event_recorder)
        case LTTNG_KERNEL_ABI_TRACEPOINT:
                ret = lttng_wrapper_tracepoint_probe_register(desc->event_kname,
                                                  desc->tp_class->probe_callback,
-                                                 event_recorder);
+                                                 &event_recorder->parent);
                break;
 
        case LTTNG_KERNEL_ABI_SYSCALL:
-               ret = lttng_syscall_filter_enable_event_recorder(event_recorder);
+               ret = lttng_syscall_filter_enable_event(&event_recorder->parent);
                break;
 
        case LTTNG_KERNEL_ABI_KPROBE:
@@ -1494,7 +1494,7 @@ int _lttng_event_recorder_unregister(struct lttng_kernel_event_recorder *event_r
        case LTTNG_KERNEL_ABI_TRACEPOINT:
                ret = lttng_wrapper_tracepoint_probe_unregister(event_priv->desc->event_kname,
                                                  event_priv->desc->tp_class->probe_callback,
-                                                 event_recorder);
+                                                 &event_recorder->parent);
                break;
 
        case LTTNG_KERNEL_ABI_KPROBE:
@@ -1508,7 +1508,7 @@ int _lttng_event_recorder_unregister(struct lttng_kernel_event_recorder *event_r
                break;
 
        case LTTNG_KERNEL_ABI_SYSCALL:
-               ret = lttng_syscall_filter_disable_event_recorder(event_recorder);
+               ret = lttng_syscall_filter_disable_event(&event_recorder->parent);
                break;
 
        case LTTNG_KERNEL_ABI_NOOP:
@@ -1516,7 +1516,7 @@ int _lttng_event_recorder_unregister(struct lttng_kernel_event_recorder *event_r
                break;
 
        case LTTNG_KERNEL_ABI_UPROBE:
-               lttng_uprobes_unregister_event(event_recorder);
+               lttng_uprobes_unregister_event(&event_recorder->parent);
                ret = 0;
                break;
 
@@ -1545,11 +1545,11 @@ void register_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
        case LTTNG_KERNEL_ABI_TRACEPOINT:
                ret = lttng_wrapper_tracepoint_probe_register(desc->event_kname,
                                                  desc->tp_class->probe_callback,
-                                                 event_notifier);
+                                                 &event_notifier->parent);
                break;
 
        case LTTNG_KERNEL_ABI_SYSCALL:
-               ret = lttng_syscall_filter_enable_event_notifier(event_notifier);
+               ret = lttng_syscall_filter_enable_event(&event_notifier->parent);
                break;
 
        case LTTNG_KERNEL_ABI_KPROBE:
@@ -1586,7 +1586,7 @@ int _lttng_event_notifier_unregister(
        case LTTNG_KERNEL_ABI_TRACEPOINT:
                ret = lttng_wrapper_tracepoint_probe_unregister(event_notifier->priv->parent.desc->event_kname,
                                                  event_notifier->priv->parent.desc->tp_class->probe_callback,
-                                                 event_notifier);
+                                                 &event_notifier->parent);
                break;
 
        case LTTNG_KERNEL_ABI_KPROBE:
@@ -1595,12 +1595,12 @@ int _lttng_event_notifier_unregister(
                break;
 
        case LTTNG_KERNEL_ABI_UPROBE:
-               lttng_uprobes_unregister_event_notifier(event_notifier);
+               lttng_uprobes_unregister_event(&event_notifier->parent);
                ret = 0;
                break;
 
        case LTTNG_KERNEL_ABI_SYSCALL:
-               ret = lttng_syscall_filter_disable_event_notifier(event_notifier);
+               ret = lttng_syscall_filter_disable_event(&event_notifier->parent);
                break;
 
        case LTTNG_KERNEL_ABI_KRETPROBE:
@@ -1658,7 +1658,7 @@ void _lttng_event_destroy(struct lttng_kernel_event_common *event)
 
                case LTTNG_KERNEL_ABI_UPROBE:
                        module_put(event_priv->desc->owner);
-                       lttng_uprobes_destroy_event_private(event_recorder);
+                       lttng_uprobes_destroy_event_private(&event_recorder->parent);
                        break;
 
                case LTTNG_KERNEL_ABI_FUNCTION:
@@ -1693,7 +1693,7 @@ void _lttng_event_destroy(struct lttng_kernel_event_common *event)
 
                case LTTNG_KERNEL_ABI_UPROBE:
                        module_put(event_notifier->priv->parent.desc->owner);
-                       lttng_uprobes_destroy_event_notifier_private(event_notifier);
+                       lttng_uprobes_destroy_event_private(&event_notifier->parent);
                        break;
 
                case LTTNG_KERNEL_ABI_KRETPROBE:
@@ -2242,7 +2242,7 @@ void lttng_create_syscall_event_if_missing(struct lttng_event_recorder_enabler *
 {
        int ret;
 
-       ret = lttng_syscalls_register_event(event_enabler);
+       ret = lttng_syscalls_register_event(&event_enabler->parent);
        WARN_ON_ONCE(ret);
 }
 
@@ -2251,7 +2251,7 @@ void lttng_create_syscall_event_notifier_if_missing(struct lttng_event_notifier_
 {
        int ret;
 
-       ret = lttng_syscalls_register_event_notifier(event_notifier_enabler);
+       ret = lttng_syscalls_register_event(&event_notifier_enabler->parent);
        WARN_ON_ONCE(ret);
        ret = lttng_syscalls_create_matching_event_notifiers(event_notifier_enabler);
        WARN_ON_ONCE(ret);