fix: uuid: Decouple guid_t and uuid_le types and respective macros (v6.3)

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

diff --git a/include/lttng/events-internal.h b/include/lttng/events-internal.h
index 3923232bf76623a8481d8894583d9b34ff503ac0..a91a659ebdeb586eb8a0d515214f841729e28b6a 100644 (file)
--- a/include/lttng/events-internal.h
+++ b/include/lttng/events-internal.h
@@ -8,6 +8,9 @@
 #ifndef _LTTNG_EVENTS_INTERNAL_H
 #define _LTTNG_EVENTS_INTERNAL_H
 
+#include <wrapper/compiler_attributes.h>
+#include <wrapper/uuid.h>
+
 #include <lttng/events.h>
 
 struct lttng_syscall_filter;
@@ -287,7 +290,7 @@ struct lttng_metadata_cache {
        atomic_t producing;             /* Metadata being produced (incomplete) */
        struct kref refcount;           /* Metadata cache usage */
        struct list_head metadata_stream;       /* Metadata stream list */
-       uuid_le uuid;                   /* Trace session unique ID (copy) */
+       guid_t uuid;                    /* Trace session unique ID (copy) */
        struct mutex lock;              /* Produce/consume lock */
        uint64_t version;               /* Current version of the metadata */
 };
@@ -461,7 +464,7 @@ struct lttng_kernel_session_private {
        struct list_head events;                /* Event list head */
        struct list_head list;                  /* Session list */
        unsigned int free_chan_id;              /* Next chan ID to allocate */
-       uuid_le uuid;                           /* Trace session unique ID */
+       guid_t uuid;                            /* Trace session unique ID */
        struct lttng_metadata_cache *metadata_cache;
        unsigned int metadata_dumped:1,
                tstate:1;                       /* Transient enable state */
@@ -561,9 +564,12 @@ static inline bool lttng_kernel_type_is_bytewise_integer(const struct lttng_kern
        if (!type_integer)
                return false;
        switch (type_integer->size) {
-       case 8:         /* Fall-through. */
-       case 16:        /* Fall-through. */
-       case 32:        /* Fall-through. */
+       case 8:
+               lttng_fallthrough;
+       case 16:
+               lttng_fallthrough;
+       case 32:
+               lttng_fallthrough;
        case 64:
                break;
        default:
@@ -714,7 +720,8 @@ int lttng_add_uts_ns_to_ctx(struct lttng_kernel_ctx **ctx)
 #endif
 
 #if defined(CONFIG_TIME_NS) && \
-       (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0))
+       (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0) || \
+       LTTNG_RHEL_KERNEL_RANGE(4,18,0,305,0,0, 4,19,0,0,0,0))
 int lttng_add_time_ns_to_ctx(struct lttng_kernel_ctx **ctx);
 #else
 static inline
@@ -842,25 +849,34 @@ static inline int lttng_syscalls_destroy(struct lttng_kernel_channel_buffer *cha
 }
 
 static inline int lttng_syscall_filter_enable_event(struct lttng_kernel_channel_buffer *chan,
-               struct lttng_kernel_event_recorder *event);
+               struct lttng_kernel_event_recorder *event)
 {
        return -ENOSYS;
 }
 
 static inline int lttng_syscall_filter_disable_event(struct lttng_kernel_channel_buffer *chan,
-               struct lttng_kernel_event_recorder *event);
+               struct lttng_kernel_event_recorder *event)
+{
+       return -ENOSYS;
+}
+
+static inline int lttng_syscalls_destroy_event(struct lttng_kernel_channel_buffer *chan)
+{
+       return 0;
+}
+
+static inline int lttng_syscalls_create_matching_event_notifiers(struct lttng_event_notifier_enabler *event_notifier_enabler)
 {
        return -ENOSYS;
 }
 
 static inline long lttng_channel_syscall_mask(struct lttng_kernel_channel_buffer *channel,
-               struct lttng_kernel_syscall_mask __user *usyscall_mask)
+               struct lttng_kernel_abi_syscall_mask __user *usyscall_mask)
 {
        return -ENOSYS;
 }
 
-static inline int lttng_syscalls_register_event_notifier(
-               struct lttng_event_notifier_group *group)
+static inline int lttng_syscalls_register_event_notifier(struct lttng_event_notifier_enabler *event_notifier_enabler)
 {
        return -ENOSYS;
 }
@@ -871,16 +887,12 @@ static inline int lttng_syscalls_unregister_event_notifier_group(
        return 0;
 }
 
-static inline int lttng_syscall_filter_enable_event_notifier(
-               struct lttng_event_notifier_group *group,
-               const char *name)
+static inline int lttng_syscall_filter_enable_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
 {
        return -ENOSYS;
 }
 
-static inline int lttng_syscall_filter_disable_event_notifier(
-               struct lttng_event_notifier_group *group,
-               const char *name)
+static inline int lttng_syscall_filter_disable_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
 {
        return -ENOSYS;
 }