X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-events.h;h=9c8f03b8d4fc27849cf31c557e44de78da350fd8;hb=141ddf2856b853516b4170ef8104afe85e6efe68;hp=9d775d5723d17d614547023c770ecc19ed0c8fbf;hpb=65c85aa61984217039857513bbe988036f371693;p=lttng-modules.git

diff --git a/lttng-events.h b/lttng-events.h
index 9d775d57..9c8f03b8 100644
--- a/lttng-events.h
+++ b/lttng-events.h
@@ -28,6 +28,7 @@
 #include <linux/kprobes.h>
 #include <linux/kref.h>
 #include <wrapper/uuid.h>
+#include <lttng-tracer.h>
 #include <lttng-abi.h>
 #include <lttng-abi-old.h>
 
@@ -68,8 +69,13 @@ enum channel_type {
 	METADATA_CHANNEL,
 };
 
+struct lttng_enum_value {
+	unsigned long long value;
+	unsigned int signedness:1;
+};
+
 struct lttng_enum_entry {
-	unsigned long long start, end;	/* start and end are inclusive */
+	struct lttng_enum_value start, end;	/* start and end are inclusive */
 	const char *string;
 };
 
@@ -100,7 +106,8 @@ struct lttng_integer_type {
 union _lttng_basic_type {
 	struct lttng_integer_type integer;
 	struct {
-		const char *name;
+		const struct lttng_enum_desc *desc;	/* Enumeration mapping */
+		struct lttng_integer_type container_type;
 	} enumeration;
 	struct {
 		enum lttng_string_encodings encoding;
@@ -148,11 +155,10 @@ struct lttng_type {
 	} u;
 };
 
-struct lttng_enum {
+struct lttng_enum_desc {
 	const char *name;
-	struct lttng_type container_type;
 	const struct lttng_enum_entry *entries;
-	unsigned int len;
+	unsigned int nr_entries;
 };
 
 /* Event field description */