X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Ftypes.h;h=417bb691ca6020453905c7ecac64596955d00759;hp=b77ac4002017dbb3a7ed0c50fa00b374fbfe23f2;hb=90b676d73fc6f817958083c0f159028a2f0b40ca;hpb=0a46062b3916eda6f871b5d80c4b97dcb3804d37;ds=sidebyside

diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h
index b77ac400..417bb691 100644
--- a/include/babeltrace/types.h
+++ b/include/babeltrace/types.h
@@ -35,6 +35,7 @@ struct type_class {
 	size_t (*copy)(unsigned char *dest, const struct format *fdest, 
 		       const unsigned char *src, const struct format *fsrc,
 		       const struct type_class *type_class);
+	void (*free)(struct type_class *type_class);
 };
 
 struct type_class_integer {
@@ -57,9 +58,14 @@ struct type_class_float {
 	/* TODO: we might want to express more info about NaN, +inf and -inf */
 };
 
+struct enum_table {
+	GHashTable *value_to_quark;	/* Tuples (value, GQuark) */
+	GHashTable *quark_to_value;	/* Tuples (GQuark, value) */
+};
+
 struct type_class_enum {
-	struct type_class_bitfield;	/* inherit from bitfield */
-	struct enum_table *table;
+	struct type_class_bitfield p;	/* inherit from bitfield */
+	struct enum_table table;
 };
 
 struct type_class_struct {
@@ -90,4 +96,26 @@ struct type_class_float *float_type_new(const char *name,
 					size_t alignment);
 void float_type_free(struct type_class_float *float_class);
 
+/*
+ * A GQuark can be translated to/from strings with g_quark_from_string() and
+ * g_quark_to_string().
+ */
+GQuark enum_uint_to_quark(const struct type_class_enum *enum_class, uint64_t v);
+GQuark enum_int_to_quark(const struct type_class_enum *enum_class, uint64_t v);
+uint64_t enum_quark_to_uint(const struct type_class_enum *enum_class,
+			    size_t len, int byte_order, GQuark q);
+int64_t enum_quark_to_int(const struct type_class_enum *enum_class,
+			  size_t len, int byte_order, GQuark q);
+void enum_signed_insert(struct type_class_enum *enum_class,
+			int64_t v, GQuark q);
+void enum_unsigned_insert(struct type_class_enum *enum_class,
+			  uint64_t v, GQuark q);
+
+struct type_class_enum *enum_type_new(const char *name,
+				      size_t start_offset,
+				      size_t len, int byte_order,
+				      int signedness,
+				      size_t alignment);
+void enum_type_free(struct type_class_enum *enum_class);
+
 #endif /* _BABELTRACE_TYPES_H */