X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Finstrumentation%2Fsyscalls%2Fheaders%2Fsyscalls_integers_override.h;h=74bc9dcf5b1c91599c2df21193a673f1cd993fd1;hb=039f9a2305408e45513f4209968f22d4059407b9;hp=4a61a5c7f2197c1e50034685feef2b2b169b1077;hpb=12bb2edb6ed3e96d3299a979e49b828f2b17dcb2;p=lttng-modules.git

diff --git a/include/instrumentation/syscalls/headers/syscalls_integers_override.h b/include/instrumentation/syscalls/headers/syscalls_integers_override.h
index 4a61a5c7..74bc9dcf 100644
--- a/include/instrumentation/syscalls/headers/syscalls_integers_override.h
+++ b/include/instrumentation/syscalls/headers/syscalls_integers_override.h
@@ -2,6 +2,8 @@
 
 #ifndef CREATE_SYSCALL_TABLE
 
+#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM
+
 /*
  * The `flags` argument of the mmap syscall is split in two parts:
  * - The type of mapping is described by the four least significant bits of the 4
@@ -88,52 +90,33 @@ SC_LTTNG_TRACEPOINT_ENUM(lttng_mmap_flags_options,
 )
 
 #define LTTNG_MMAP_FLAGS_TYPE						\
-{									\
-	.name = "type",							\
-	.type = {							\
-		.type = lttng_kernel_type_enum_nestable,				\
-		.u = {							\
-			.enum_nestable = {				\
-				.desc = &__enum_lttng_mmap_flags_mapping_type,		\
-				.container_type =  __LTTNG_COMPOUND_LITERAL(		\
-					struct lttng_type, __type_integer(uint32_t,	\
-						4, 1, -1, __BYTE_ORDER, 16, none)),	\
-			},						\
-		},							\
-	},								\
-}
+	lttng_kernel_static_event_field("type",				\
+		lttng_kernel_static_type_enum(&__enum_lttng_mmap_flags_mapping_type, \
+				lttng_kernel_static_type_integer(4, 1, 0, __BYTE_ORDER, 16)), \
+		false, false)
 
 #define LTTNG_MMAP_FLAGS_OPTIONS					\
-{									\
-	.name = "options",						\
-	.type = {							\
-		.type = lttng_kernel_type_enum_nestable,				\
-		.u = {							\
-			.enum_nestable = {				\
-				.desc = &__enum_lttng_mmap_flags_options,	    \
-				.container_type = __LTTNG_COMPOUND_LITERAL(	    \
-					struct lttng_type, __type_integer(uint32_t, \
-						28, 1, -1, __BYTE_ORDER, 16, none)),\
-			},						\
-		},							\
-	},								\
-}
+	lttng_kernel_static_event_field("options",			\
+		lttng_kernel_static_type_enum(&__enum_lttng_mmap_flags_options, \
+				lttng_kernel_static_type_integer(28, 1, 0, __BYTE_ORDER, 16)), \
+		false, false)
 
 #if (__BYTE_ORDER == __LITTLE_ENDIAN)
 #define LTTNG_MMAP_FLAGS			\
+lttng_kernel_static_event_field_array(		\
 	[0] = LTTNG_MMAP_FLAGS_TYPE,		\
-	[1] = LTTNG_MMAP_FLAGS_OPTIONS,
-
+	[1] = LTTNG_MMAP_FLAGS_OPTIONS,		\
+)
 #else
 #define LTTNG_MMAP_FLAGS			\
+lttng_kernel_static_event_field_array(		\
 	[0] = LTTNG_MMAP_FLAGS_OPTIONS,		\
-	[1] = LTTNG_MMAP_FLAGS_TYPE,
+	[1] = LTTNG_MMAP_FLAGS_TYPE,		\
+)
 #endif
 
-/*
- * Use a custom field here so that tracer writes a single integer and the
- * work of splitting it up in two fields is left to the trace reader.
- */
+#endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */
+
 #define OVERRIDE_32_mmap
 #define OVERRIDE_64_mmap
 SC_LTTNG_TRACEPOINT_EVENT(mmap,
@@ -145,19 +128,17 @@ SC_LTTNG_TRACEPOINT_EVENT(mmap,
 	TP_FIELDS(sc_exit(ctf_integer_hex(unsigned long, ret, ret))
 		sc_in(ctf_integer_hex(unsigned long, addr, addr))
 		sc_in(ctf_integer(size_t, len, len))
+#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM
+		/*
+		 * Use a custom field here so that tracer writes a single
+		 * integer and the work of splitting it up in two fields is
+		 * left to the trace reader.
+		 */
 		sc_in(ctf_enum(lttng_mmap_protection, int, prot, prot))
 		sc_in(
 			ctf_custom_field(
 				ctf_custom_type(
-					{
-						.type = lttng_kernel_type_struct_nestable,
-						.u.struct_nestable.nr_fields = 2,
-						.u.struct_nestable.fields =
-							__LTTNG_COMPOUND_LITERAL(struct lttng_event_field,
-								LTTNG_MMAP_FLAGS
-							),
-						.u.struct_nestable.alignment = lttng_alignof(uint32_t) * CHAR_BIT,
-					}
+					lttng_kernel_static_type_struct(2, LTTNG_MMAP_FLAGS, lttng_alignof(uint32_t) * CHAR_BIT)
 				),
 				flags,
 				ctf_custom_code(
@@ -165,11 +146,16 @@ SC_LTTNG_TRACEPOINT_EVENT(mmap,
 				)
 			)
 		)
+#else
+		sc_in(ctf_integer(int, prot, prot))
+		sc_in(ctf_integer(int, flags, flags))
+#endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */
 		sc_in(ctf_integer(int, fd, fd))
 		sc_in(ctf_integer(off_t, offset, off))
 	)
 )
 
+#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM
 /*
  * Enumeration of the open flags, as described in the 'open'
  * system call man page.
@@ -234,5 +220,6 @@ SC_LTTNG_TRACEPOINT_EVENT(fcntl,
 		sc_in(ctf_enum(lttng_fcntl_cmd_flags, unsigned int, cmd, cmd))
 		sc_inout(ctf_integer(unsigned long, arg, arg)))
 )
+#endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */
 
 #endif /* CREATE_SYSCALL_TABLE */