projects / lttng-modules.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Cleanup: events.h: add alignment comments and fix whitespace
[lttng-modules.git] / include / instrumentation / syscalls / headers / syscalls_pointers_override.h
diff --git a/include/instrumentation/syscalls/headers/syscalls_pointers_override.h b/include/instrumentation/syscalls/headers/syscalls_pointers_override.h
index cbd226aa454a7ff93d7155045488d3c15a6d11b6..0b7134b68217f3e4ee6727fee50a200298851146 100644 (file)
--- a/include/instrumentation/syscalls/headers/syscalls_pointers_override.h
+++ b/include/instrumentation/syscalls/headers/syscalls_pointers_override.h
@@ -14,6 +14,8 @@ SC_LTTNG_TRACEPOINT_EVENT(execve,
        )
 )
 
+#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM
+
 /*
  * Clone()'s `flags` field has two parts:
  *     1. exit signal: the least significant byte of the `unsigned long` is
@@ -145,6 +147,7 @@ lttng_kernel_static_event_field_array(              \
 )
 #endif
 
+#endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */
 
 #define OVERRIDE_32_clone
 #define OVERRIDE_64_clone
@@ -156,6 +159,7 @@ SC_LTTNG_TRACEPOINT_EVENT(clone,
        TP_FIELDS(
                sc_exit(ctf_integer(long, ret, ret))
                sc_in(
+#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM
                        ctf_custom_field(
                                ctf_custom_type(
                                        lttng_kernel_static_type_struct(2, LTTNG_CLONE_FLAGS, lttng_alignof(unsigned long) * CHAR_BIT)
@@ -165,6 +169,9 @@ SC_LTTNG_TRACEPOINT_EVENT(clone,
                                        ctf_integer_type(unsigned long, clone_flags)
                                )
                        )
+#else
+                       ctf_integer_hex(unsigned long, flags, clone_flags)
+#endif
                )
                sc_in(ctf_integer_hex(unsigned long, newsp, newsp))
                sc_in(ctf_integer_hex(void *, parent_tid, parent_tid))
@@ -457,6 +464,7 @@ SC_LTTNG_TRACEPOINT_EVENT_CODE(pselect6,
 )
 #endif /* defined(CONFIG_X86_32) || defined(CONFIG_X86_64) || defined(CONFIG_ARM64) || defined(CONFIG_ARM) */
 
+#ifdef LTTNG_CREATE_FIELD_METADATA
 #ifndef ONCE_LTTNG_TRACE_POLL_H
 #define ONCE_LTTNG_TRACE_POLL_H
 
@@ -464,6 +472,7 @@ SC_LTTNG_TRACEPOINT_EVENT_CODE(pselect6,
 #define POLL_FLAGS_PADDING_SIZE (sizeof(uint8_t) * BITS_PER_BYTE) - \
        ilog2(LTTNG_POLL_NRFLAGS - 1)
 
+#ifndef LTTNG_TRACEPOINT_TYPE_EXTERN
 /*
  * Only extract the values specified by iBCS2 for now.
  */
@@ -491,18 +500,30 @@ static const struct lttng_kernel_event_field *lttng_pollfd_flag_fields[] = {
                                false, false, false),
 };
 
+static_assert(((ARRAY_SIZE(lttng_pollfd_flag_fields) - 1) + POLL_FLAGS_PADDING_SIZE) == sizeof(uint8_t) * BITS_PER_BYTE);
+
+#endif /* LTTNG_TRACEPOINT_TYPE_EXTERN */
+
+LTTNG_TRACEPOINT_TYPE(PARAMS(const struct lttng_kernel_type_struct lttng_pollfd_flag_fields_struct),
+       PARAMS(lttng_kernel_static_type_struct_init(ARRAY_SIZE(lttng_pollfd_flag_fields), lttng_pollfd_flag_fields, 0)))
+
+#ifndef LTTNG_TRACEPOINT_TYPE_EXTERN
 static const struct lttng_kernel_event_field *lttng_pollfd_fields[] = {
        [0] = lttng_kernel_static_event_field("fd", lttng_kernel_static_type_integer_from_type(int, __BYTE_ORDER, 10),
                                false, false, false),
        [1] = lttng_kernel_static_event_field("raw_events", lttng_kernel_static_type_integer_from_type(uint16_t, __BYTE_ORDER, 16),
                                false, false, false),
        [2] = lttng_kernel_static_event_field("events",
-               lttng_kernel_static_type_struct(ARRAY_SIZE(lttng_pollfd_flag_fields),
-                       lttng_pollfd_flag_fields, 0),
+               (const struct lttng_kernel_type_common *) &lttng_pollfd_flag_fields_struct,
                false, false, false),
 };
+#endif /* LTTNG_TRACEPOINT_TYPE_EXTERN */
+
+LTTNG_TRACEPOINT_TYPE(PARAMS(const struct lttng_kernel_type_struct lttng_pollfd_fields_struct),
+       PARAMS(lttng_kernel_static_type_struct_init(ARRAY_SIZE(lttng_pollfd_fields), lttng_pollfd_fields, 0)))
 
 #endif /* ONCE_LTTNG_TRACE_POLL_H */
+#endif /* LTTNG_CREATE_FIELD_METADATA */
 
 #define LTTNG_SYSCALL_POLL_locvar                              \
        unsigned int fds_length, fds_max_len, alloc_fds;        \
@@ -510,9 +531,6 @@ static const struct lttng_kernel_event_field *lttng_pollfd_fields[] = {
        uint8_t overflow;
 
 #define LTTNG_SYSCALL_POLL_code_pre                            \
-       BUILD_BUG_ON(((ARRAY_SIZE(lttng_pollfd_flag_fields) - 1) +                      \
-                       POLL_FLAGS_PADDING_SIZE) !=                                     \
-                               sizeof(uint8_t) * BITS_PER_BYTE);                       \
        tp_locvar->fds = NULL;                                                          \
        tp_locvar->overflow = 0;                                                        \
                                                                                        \
@@ -570,7 +588,7 @@ end:                                                                                        \
                ctf_custom_field(                                                               \
                        ctf_custom_type(                                                        \
                                lttng_kernel_static_type_sequence("fds_length",                 \
-                                       lttng_kernel_static_type_struct(ARRAY_SIZE(lttng_pollfd_fields), lttng_pollfd_fields, 0), \
+                                       (const struct lttng_kernel_type_common *) &lttng_pollfd_fields_struct, \
                                        0,                                                      \
                                        none)                                                   \
                        ),                                                                      \
@@ -592,7 +610,7 @@ end:                                                                                        \
                ctf_custom_field(                                                               \
                        ctf_custom_type(                                                        \
                                lttng_kernel_static_type_sequence("fds_length",                 \
-                                       lttng_kernel_static_type_struct(ARRAY_SIZE(lttng_pollfd_fields), lttng_pollfd_fields, 0), \
+                                       (const struct lttng_kernel_type_common *) &lttng_pollfd_fields_struct, \
                                        0,                                                      \
                                        none)                                                   \
                        ),                                                                      \
@@ -699,6 +717,8 @@ SC_LTTNG_TRACEPOINT_ENUM(lttng_epoll_op,
        )
 )
 
+#ifdef LTTNG_CREATE_FIELD_METADATA
+
 #ifndef ONCE_LTTNG_TRACE_EPOLL_CTL_H
 #define ONCE_LTTNG_TRACE_EPOLL_CTL_H
 
@@ -706,6 +726,7 @@ SC_LTTNG_TRACEPOINT_ENUM(lttng_epoll_op,
 #define EPOLL_FLAGS_PADDING_SIZE (sizeof(uint8_t) * BITS_PER_BYTE) - \
        ilog2(LTTNG_EPOLL_NRFLAGS - 1)
 
+#ifndef LTTNG_TRACEPOINT_TYPE_EXTERN
 /*
  * Only extract the values specified by iBCS2 for now.
  */
@@ -734,7 +755,12 @@ static const struct lttng_kernel_event_field *lttng_epoll_ctl_events_fields[] =
                        lttng_kernel_static_type_integer(EPOLL_FLAGS_PADDING_SIZE, 1, 0, __LITTLE_ENDIAN, 10),
                        false, false, false),
 };
+#endif /* LTTNG_TRACEPOINT_TYPE_EXTERN */
 
+LTTNG_TRACEPOINT_TYPE(PARAMS(const struct lttng_kernel_type_struct lttng_epoll_ctl_events_fields_struct),
+       PARAMS(lttng_kernel_static_type_struct_init(ARRAY_SIZE(lttng_epoll_ctl_events_fields), lttng_epoll_ctl_events_fields, 0)))
+
+#ifndef LTTNG_TRACEPOINT_TYPE_EXTERN
 static const struct lttng_kernel_event_field *lttng_epoll_data_fields[] = {
        [0] = lttng_kernel_static_event_field("u64",
                        lttng_kernel_static_type_integer_from_type(uint64_t, __BYTE_ORDER, 16),
@@ -743,23 +769,30 @@ static const struct lttng_kernel_event_field *lttng_epoll_data_fields[] = {
                        lttng_kernel_static_type_integer_from_type(int, __BYTE_ORDER, 10),
                        false, false, false),
 };
+#endif /* LTTNG_TRACEPOINT_TYPE_EXTERN */
+
+LTTNG_TRACEPOINT_TYPE(PARAMS(const struct lttng_kernel_type_struct lttng_epoll_data_fields_struct),
+       PARAMS(lttng_kernel_static_type_struct_init(ARRAY_SIZE(lttng_epoll_data_fields), lttng_epoll_data_fields, 0)))
 
+#ifndef LTTNG_TRACEPOINT_TYPE_EXTERN
 static const struct lttng_kernel_event_field *epoll_ctl_fields[] = {
        [0] = lttng_kernel_static_event_field("data_union",
-               lttng_kernel_static_type_struct(ARRAY_SIZE(lttng_epoll_data_fields),
-                               lttng_epoll_data_fields,
-                               0),
+               (const struct lttng_kernel_type_common *) &lttng_epoll_data_fields_struct,
                false, false, false),
        [1] = lttng_kernel_static_event_field("raw_events",
                lttng_kernel_static_type_integer_from_type(uint32_t, __BYTE_ORDER, 16),
                false, false, false),
        [2] = lttng_kernel_static_event_field("events",
-               lttng_kernel_static_type_struct(ARRAY_SIZE(lttng_epoll_ctl_events_fields),
-                               lttng_epoll_ctl_events_fields,
-                               0),
+               (const struct lttng_kernel_type_common *) &lttng_epoll_ctl_events_fields_struct,
                false, false, false),
 };
+#endif /* LTTNG_TRACEPOINT_TYPE_EXTERN */
+
+LTTNG_TRACEPOINT_TYPE(PARAMS(const struct lttng_kernel_type_struct epoll_ctl_fields_struct),
+       PARAMS(lttng_kernel_static_type_struct_init(ARRAY_SIZE(epoll_ctl_fields), epoll_ctl_fields, 0)))
+
 #endif /* ONCE_LTTNG_TRACE_EPOLL_CTL_H */
+#endif /* LTTNG_CREATE_FIELD_METADATA */
 
 #if defined(CONFIG_X86_32) || defined(CONFIG_X86_64) || defined(CONFIG_ARM64) || defined(CONFIG_ARM)
 #define OVERRIDE_32_epoll_ctl
@@ -784,7 +817,7 @@ SC_LTTNG_TRACEPOINT_EVENT_CODE(epoll_ctl,
                sc_in(
                        ctf_custom_field(
                                ctf_custom_type(
-                                       lttng_kernel_static_type_struct(ARRAY_SIZE(epoll_ctl_fields), epoll_ctl_fields, 0)
+                                       (const struct lttng_kernel_type_common *) &epoll_ctl_fields_struct
                                ),
                                event,
                                ctf_custom_code(
@@ -810,21 +843,31 @@ SC_LTTNG_TRACEPOINT_EVENT_CODE(epoll_ctl,
 )
 #endif /* defined(CONFIG_X86_32) || defined(CONFIG_X86_64) || defined(CONFIG_ARM64) || defined(CONFIG_ARM) */
 
+#ifdef LTTNG_CREATE_FIELD_METADATA
 #ifndef ONCE_LTTNG_TRACE_EPOLL_H
 #define ONCE_LTTNG_TRACE_EPOLL_H
 
+#ifndef LTTNG_TRACEPOINT_TYPE_EXTERN
 static const struct lttng_kernel_event_field *lttng_epoll_wait_fields[] = lttng_kernel_static_event_field_array(
        [0] = lttng_kernel_static_event_field("data_union",
-                       lttng_kernel_static_type_struct(ARRAY_SIZE(lttng_epoll_data_fields), lttng_epoll_data_fields, 0),
+                       (const struct lttng_kernel_type_common *) &lttng_epoll_data_fields_struct,
                        false, false, false),
        [1] = lttng_kernel_static_event_field("raw_events", lttng_kernel_static_type_integer_from_type(uint32_t, __BYTE_ORDER, 16),
                        false, false, false),
        [2] = lttng_kernel_static_event_field("events",
-                       lttng_kernel_static_type_struct(ARRAY_SIZE(lttng_epoll_ctl_events_fields), lttng_epoll_ctl_events_fields, 0),
+                       (const struct lttng_kernel_type_common *) &lttng_epoll_ctl_events_fields_struct,
                        false, false, false),
 );
 
+static_assert(((ARRAY_SIZE(lttng_epoll_ctl_events_fields) - 1) + EPOLL_FLAGS_PADDING_SIZE) == sizeof(uint8_t) * BITS_PER_BYTE);
+
+#endif /* LTTNG_TRACEPOINT_TYPE_EXTERN */
+
+LTTNG_TRACEPOINT_TYPE(PARAMS(const struct lttng_kernel_type_struct lttng_epoll_wait_fields_struct),
+       PARAMS(lttng_kernel_static_type_struct_init(ARRAY_SIZE(lttng_epoll_wait_fields), lttng_epoll_wait_fields, 0)))
+
 #endif /* ONCE_LTTNG_TRACE_EPOLL_H */
+#endif /* LTTNG_CREATE_FIELD_METADATA */
 
 #define LTTNG_SYSCALL_EPOLL_WAIT_locvar                \
        sc_out(                                 \
@@ -834,9 +877,6 @@ static const struct lttng_kernel_event_field *lttng_epoll_wait_fields[] = lttng_
        )
 
 #define LTTNG_SYSCALL_EPOLL_WAIT_code_pre                                      \
-       BUILD_BUG_ON(((ARRAY_SIZE(lttng_epoll_ctl_events_fields) - 1) +         \
-                       EPOLL_FLAGS_PADDING_SIZE) !=                            \
-                               sizeof(uint8_t) * BITS_PER_BYTE);               \
        sc_out({                                                                \
                int err;                                                        \
                unsigned long maxalloc;                                         \
@@ -881,7 +921,7 @@ static const struct lttng_kernel_event_field *lttng_epoll_wait_fields[] = lttng_
        ctf_custom_field(                                                               \
                ctf_custom_type(                                                        \
                        lttng_kernel_static_type_sequence("fds_length",                 \
-                               lttng_kernel_static_type_struct(ARRAY_SIZE(lttng_epoll_wait_fields), lttng_epoll_wait_fields, 0), \
+                               (const struct lttng_kernel_type_common *) &lttng_epoll_wait_fields_struct, \
                                0,                                                      \
                                none)                                                   \
                ),                                                                      \
@@ -985,6 +1025,7 @@ SC_LTTNG_TRACEPOINT_EVENT(socketpair,
 )
 #endif /* (defined(CONFIG_X86_64) && !defined(LTTNG_SC_COMPAT)) || defined(CONFIG_ARM64) || defined(CONFIG_ARM) */
 
+#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM
 /*
  * Enumeration of the open flags, as described in the 'open'
  * system call man page.
@@ -1066,5 +1107,6 @@ SC_LTTNG_TRACEPOINT_EVENT(open,
                sc_in(ctf_enum(lttng_file_mode, umode_t, mode, mode))
        )
 )
+#endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */
 
 #endif /* CREATE_SYSCALL_TABLE */
LTTng 2.0/0.x modules
This page took 0.02807 seconds and 4 git commands to generate.