X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=include%2Fbabeltrace%2Ftypes.h;h=0cedb337b03d389dfdda9199c8a2477986c33c46;hb=3122e6f075647374e7a98ae9501d100de8d004a9;hp=f3a0e831b15fcdfb9a85f76dc79a0c569222ca8a;hpb=98b6832656447ab0f8024f9086aa67625e391ac7;p=babeltrace.git

diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h
index f3a0e831..0cedb337 100644
--- a/include/babeltrace/types.h
+++ b/include/babeltrace/types.h
@@ -23,6 +23,7 @@
 
 #include <babeltrace/align.h>
 #include <babeltrace/list.h>
+#include <babeltrace/ctf/events.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <limits.h>
@@ -37,6 +38,7 @@ struct ctf_stream;
 struct stream_pos;
 struct format;
 struct definition;
+struct ctf_clock;
 
 /* type scope */
 struct declaration_scope {
@@ -68,20 +70,6 @@ struct definition_scope {
 	GArray *scope_path;	/* array of GQuark */
 };
 
-enum ctf_type_id {
-	CTF_TYPE_UNKNOWN = 0,
-	CTF_TYPE_INTEGER,
-	CTF_TYPE_FLOAT,
-	CTF_TYPE_ENUM,
-	CTF_TYPE_STRING,
-	CTF_TYPE_STRUCT,
-	CTF_TYPE_UNTAGGED_VARIANT,
-	CTF_TYPE_VARIANT,
-	CTF_TYPE_ARRAY,
-	CTF_TYPE_SEQUENCE,
-	NR_CTF_TYPES,
-};
-
 struct declaration {
 	enum ctf_type_id id;
 	size_t alignment;	/* type alignment, in bits */
@@ -151,6 +139,7 @@ struct declaration_integer {
 	int signedness;
 	int base;		/* Base for pretty-printing: 2, 8, 10, 16 */
 	enum ctf_string_encoding encoding;
+	struct ctf_clock *clock;
 };
 
 struct definition_integer {
@@ -197,7 +186,7 @@ struct enum_range {
 };
 
 struct enum_range_to_quark {
-	struct cds_list_head node;
+	struct bt_list_head node;
 	struct enum_range range;
 	GQuark quark;
 };
@@ -216,7 +205,7 @@ struct enum_range_to_quark {
  */
 struct enum_table {
 	GHashTable *value_to_quark_set;		/* (value, GQuark GArray) */
-	struct cds_list_head range_to_quark;	/* (range, GQuark) */
+	struct bt_list_head range_to_quark;	/* (range, GQuark) */
 	GHashTable *quark_to_range_set;		/* (GQuark, range GArray) */
 };
 
@@ -382,7 +371,8 @@ void definition_unref(struct definition *definition);
 
 struct declaration_integer *integer_declaration_new(size_t len, int byte_order,
 				  int signedness, size_t alignment,
-				  int base, enum ctf_string_encoding encoding);
+				  int base, enum ctf_string_encoding encoding,
+				  struct ctf_clock *clock);
 uint64_t get_unsigned_int(struct definition *field);
 int64_t get_signed_int(struct definition *field);