X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=probes%2Flttng-types.h;h=bbae874742e56a19a11a1050c276b1049e849644;hb=c099397a53087b8c616a7feaef0c26d939b9662f;hp=cbe1dea1c4f4524624cc58ab358df3848d509589;hpb=97ca2c5484815a67b70fcf2b1772eb1b2c2e5633;p=lttng-modules.git

diff --git a/probes/lttng-types.h b/probes/lttng-types.h
index cbe1dea1..bbae8747 100644
--- a/probes/lttng-types.h
+++ b/probes/lttng-types.h
@@ -28,9 +28,6 @@
 # include <endian.h>
 #endif
 
-void lttng_print_event_type(struct seq_file *m, unsigned int indent,
-			    const struct lttng_type *type);
-
 #endif /* _LTTNG_PROBES_LTTNG_TYPES_H */
 
 
@@ -63,58 +60,15 @@ void lttng_print_event_type(struct seq_file *m, unsigned int indent,
 
 #ifdef STAGE_EXPORT_TYPES
 
-#undef TRACE_EVENT_TYPE___integer_ext
-#define TRACE_EVENT_TYPE___integer_ext(_name, _byte_order)	\
-		{						\
-		  .atype = atype_integer,			\
-		  .name = #_name,				\
-		  .u.integer.size = sizeof(_name) * 8,		\
-		  .u.integer.alignment = __alignof__(_name) * 8,\
-		  .u.integer.signedness = is_signed_type(_name),\
-		  .u.integer.reverse_byte_order = ((_byte_order) != __BYTE_ORDER),\
-		},
-
-#undef TRACE_EVENT_TYPE___integer
-#define TRACE_EVENT_TYPE___integer(_name, _unused)		\
-		TRACE_EVENT_TYPE___integer_ext(_name, __BYTE_ORDER)
-
 #undef TRACE_EVENT_TYPE___enum
-#define TRACE_EVENT_TYPE___enum(_name, _parent_type)		\
-		{						\
-		  .atype = atype_enum,				\
-		  .name = #_name,				\
-		  .u.enumeration.parent_type = #_parent_type,	\
-		  .u.enumeration.def.entries = __trace_event_enum_##_name, \
-		  .u.enumeration.def.len = ARRAY_SIZE(__trace_event_enum_##_name), \
-		},
-
-#undef TRACE_EVENT_TYPE___array
-#define TRACE_EVENT_TYPE___array(_name, _elem_type, _length)	\
-		{						\
-		  .atype = atype_array,				\
-		  .name = #_name,				\
-		  .u.array.elem_type = #_elem_type,		\
-		  .u.array.length = _length,			\
+#define TRACE_EVENT_TYPE___enum(_name, _container_type)			\
+		{							\
+		  .name = #_name,					\
+		  .container_type = __type_integer(_container_type, __BYTE_ORDER), \
+		  .entries = __trace_event_enum_##_name, \
+		  .len = ARRAY_SIZE(__trace_event_enum_##_name), \
 		},
 
-#undef TRACE_EVENT_TYPE___sequence
-#define TRACE_EVENT_TYPE___sequence(_name, _elem_type, _length_type)	\
-		{						\
-		  .atype = atype_sequence,			\
-		  .name = #_name,				\
-		  .u.sequence.elem_type = #_elem_type,		\
-		  .u.sequence.length_type = #_length_type,	\
-		},
-
-#undef TRACE_EVENT_TYPE___string
-#define TRACE_EVENT_TYPE___string(_name, _encoding)		\
-		{						\
-		  .atype = atype_string,			\
-		  .name = #_name,				\
-		  .u.string.encoding = lttng_encode_##_encoding,\
-		},
-
-
 /* Local declaration */
 #undef TRACE_EVENT_TYPE
 #define TRACE_EVENT_TYPE(_name, _abstract_type, args...)	\