Combine event notifier and recorder enable/disable functions

[lttng-modules.git] / include / lttng / events.h

diff --git a/include/lttng/events.h b/include/lttng/events.h
index ee16fc2fc97cb37fd2f5bd8f604d4cc1199cd71a..2ceec317d604edc11c0a12d7b5cd3fd7b110ab86 100644 (file)
--- a/include/lttng/events.h
+++ b/include/lttng/events.h
@@ -328,8 +328,7 @@ struct lttng_perf_counter_field {
 };
 
 struct lttng_probe_ctx {
-       struct lttng_kernel_event_recorder *event;
-       struct lttng_kernel_event_notifier *event_notifier; // Not sure if we will ever need it.
+       struct lttng_kernel_event_common *event;
        uint8_t interruptible;
 };
 
@@ -364,7 +363,6 @@ struct lttng_kernel_event_desc {
        const struct lttng_kernel_event_field **fields; /* event payload */
        unsigned int nr_fields;
        struct module *owner;
-       void *event_notifier_callback;
 };
 
 struct lttng_kernel_probe_desc {
@@ -432,10 +430,7 @@ struct lttng_enabler_ref {
 };
 
 struct lttng_uprobe_handler {
-       union {
-               struct lttng_kernel_event_recorder *event;
-               struct lttng_kernel_event_notifier *event_notifier;
-       } u;
+       struct lttng_kernel_event_common *event;
        loff_t offset;
        struct uprobe_consumer up_consumer;
        struct list_head node;
@@ -941,11 +936,8 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create(
 
 int lttng_channel_enable(struct lttng_channel *channel);
 int lttng_channel_disable(struct lttng_channel *channel);
-int lttng_event_enable(struct lttng_kernel_event_recorder *event);
-int lttng_event_disable(struct lttng_kernel_event_recorder *event);
-
-int lttng_event_notifier_enable(struct lttng_kernel_event_notifier *event_notifier);
-int lttng_event_notifier_disable(struct lttng_kernel_event_notifier *event_notifier);
+int lttng_event_enable(struct lttng_kernel_event_common *event);
+int lttng_event_disable(struct lttng_kernel_event_common *event);
 
 void lttng_transport_register(struct lttng_transport *transport);
 void lttng_transport_unregister(struct lttng_transport *transport);
@@ -1331,23 +1323,18 @@ void lttng_kprobes_destroy_event_notifier_private(struct lttng_kernel_event_noti
 }
 #endif
 
-int lttng_event_add_callsite(struct lttng_kernel_event_recorder *event,
-       struct lttng_kernel_abi_event_callsite __user *callsite);
-
-int lttng_event_notifier_add_callsite(struct lttng_kernel_event_notifier *event_notifier,
+int lttng_event_add_callsite(struct lttng_kernel_event_common *event,
        struct lttng_kernel_abi_event_callsite __user *callsite);
 
 #ifdef CONFIG_UPROBES
 int lttng_uprobes_register_event(const char *name,
        int fd, struct lttng_kernel_event_recorder *event);
-int lttng_uprobes_event_add_callsite(struct lttng_kernel_event_recorder *event,
+int lttng_uprobes_event_add_callsite(struct lttng_kernel_event_common *event,
        struct lttng_kernel_abi_event_callsite __user *callsite);
 void lttng_uprobes_unregister_event(struct lttng_kernel_event_recorder *event);
 void lttng_uprobes_destroy_event_private(struct lttng_kernel_event_recorder *event);
 int lttng_uprobes_register_event_notifier(const char *name,
        int fd, struct lttng_kernel_event_notifier *event_notifier);
-int lttng_uprobes_event_notifier_add_callsite(struct lttng_kernel_event_notifier *event_notifier,
-       struct lttng_kernel_abi_event_callsite __user *callsite);
 void lttng_uprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier);
 void lttng_uprobes_destroy_event_notifier_private(struct lttng_kernel_event_notifier *event_notifier);
 #else
@@ -1359,7 +1346,7 @@ int lttng_uprobes_register_event(const char *name,
 }
 
 static inline
-int lttng_uprobes_event_add_callsite(struct lttng_kernel_event_recorder *event,
+int lttng_uprobes_event_add_callsite(struct lttng_kernel_event_common *event,
        struct lttng_kernel_abi_event_callsite __user *callsite)
 {
        return -ENOSYS;
@@ -1382,13 +1369,6 @@ int lttng_uprobes_register_event_notifier(const char *name,
        return -ENOSYS;
 }
 
-static inline
-int lttng_uprobes_event_notifier_add_callsite(struct lttng_kernel_event_notifier *event_notifier,
-       struct lttng_kernel_abi_event_callsite __user *callsite)
-{
-       return -ENOSYS;
-}
-
 static inline
 void lttng_uprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
 {
@@ -1409,7 +1389,7 @@ int lttng_kretprobes_register(const char *name,
                struct lttng_kernel_event_recorder *event_exit);
 void lttng_kretprobes_unregister(struct lttng_kernel_event_recorder *event);
 void lttng_kretprobes_destroy_private(struct lttng_kernel_event_recorder *event);
-int lttng_kretprobes_event_enable_state(struct lttng_kernel_event_recorder *event,
+int lttng_kretprobes_event_enable_state(struct lttng_kernel_event_common *event,
        int enable);
 #else
 static inline
@@ -1434,7 +1414,7 @@ void lttng_kretprobes_destroy_private(struct lttng_kernel_event_recorder *event)
 }
 
 static inline
-int lttng_kretprobes_event_enable_state(struct lttng_kernel_event_recorder *event,
+int lttng_kretprobes_event_enable_state(struct lttng_kernel_event_common *event,
        int enable)
 {
        return -ENOSYS;