X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fenum.c;h=99f10b71be1b36ff220ae654a226e0440c2b911f;hp=199618115dcdd96e52b58559806451e91a40740b;hb=78af2bcd1a8236a26371d7638ab7acb2d41b6807;hpb=8eab883c99f13a74c3a30b288070f0038357103e

diff --git a/types/enum.c b/types/enum.c
index 19961811..99f10b71 100644
--- a/types/enum.c
+++ b/types/enum.c
@@ -3,7 +3,7 @@
  *
  * BabelTrace - Enumeration Type
  *
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,37 +21,105 @@
 #include <stdint.h>
 #include <glib.h>
 
-#if (__WORDSIZE == 32)
-GQuark enum_uint_to_quark(const struct type_class_enum *enum_class, uint64_t v)
-{
-	gconstpointer q = g_hash_table_lookup(enum_class->table.value_to_quark,
-					      &v);
-	return (GQuark) (unsigned long) q;
-}
+static
+struct definition *_enum_definition_new(struct declaration *declaration,
+					struct definition_scope *parent_scope,
+					GQuark field_name, int index);
+static
+void _enum_definition_free(struct definition *definition);
 
-GQuark enum_int_to_quark(const struct type_class_enum *enum_class, uint64_t v)
+static
+void enum_range_set_free(void *ptr)
 {
-	gconstpointer q = g_hash_table_lookup(enum_class->table.value_to_quark,
-					      &v);
-	return (GQuark) (unsigned long) q;
+	g_array_unref(ptr);
 }
 
-uint64_t enum_quark_to_uint(const struct type_class_enum *enum_class,
-			    GQuark q)
+/*
+ * Returns a GArray or NULL.
+ * Caller must release the GArray with g_array_unref().
+ */
+GArray *enum_uint_to_quark_set(const struct declaration_enum *enum_declaration,
+			       uint64_t v)
 {
-	gconstpointer v = g_hash_table_lookup(enum_class->table.quark_to_value,
-					      (gconstpointer) q);
-	return *(const uint64_t *) v;
+	struct enum_range_to_quark *iter;
+	GArray *qs, *ranges = NULL;
+
+	/* Single values lookup */
+	qs = g_hash_table_lookup(enum_declaration->table.value_to_quark_set, &v);
+
+	/* Range lookup */
+	cds_list_for_each_entry(iter, &enum_declaration->table.range_to_quark, node) {
+		if (iter->range.start._unsigned > v || iter->range.end._unsigned < v)
+			continue;
+		if (!ranges) {
+			size_t qs_len = 0;
+
+			if (qs)
+				qs_len = qs->len;
+			ranges = g_array_sized_new(FALSE, TRUE,
+					sizeof(struct enum_range),
+					qs_len + 1);
+			g_array_set_size(ranges, qs_len + 1);
+			if (qs)
+				memcpy(ranges->data, qs->data,
+				       sizeof(struct enum_range) * qs_len);
+			g_array_index(ranges, struct enum_range, qs_len) = iter->range;
+		} else {
+			g_array_set_size(ranges, ranges->len + 1);
+			g_array_index(ranges, struct enum_range, ranges->len) = iter->range;
+		}
+	}
+	if (!ranges) {
+		ranges = qs;
+		g_array_ref(ranges);
+	}
+	return ranges;
 }
 
-int64_t enum_quark_to_int(const struct type_class_enum *enum_class,
-			  GQuark q)
+/*
+ * Returns a GArray or NULL.
+ * Caller must release the GArray with g_array_unref().
+ */
+GArray *enum_int_to_quark_set(const struct declaration_enum *enum_declaration,
+			      uint64_t v)
 {
-	gconstpointer v = g_hash_table_lookup(enum_class->table.quark_to_value,
-					      (gconstpointer) q);
-	return *(const int64_t *) v;
+	struct enum_range_to_quark *iter;
+	GArray *qs, *ranges = NULL;
+
+	/* Single values lookup */
+	qs = g_hash_table_lookup(enum_declaration->table.value_to_quark_set, &v);
+
+	/* Range lookup */
+	cds_list_for_each_entry(iter, &enum_declaration->table.range_to_quark, node) {
+		if (iter->range.start._signed > v || iter->range.end._signed < v)
+			continue;
+		if (!ranges) {
+			size_t qs_len = 0;
+
+			if (qs)
+				qs_len = qs->len;
+			ranges = g_array_sized_new(FALSE, TRUE,
+					sizeof(struct enum_range),
+					qs_len + 1);
+			g_array_set_size(ranges, qs_len + 1);
+			if (qs)
+				memcpy(ranges->data, qs->data,
+				       sizeof(struct enum_range) * qs_len);
+			g_array_index(ranges, struct enum_range, qs_len) = iter->range;
+		} else {
+			g_array_set_size(ranges, ranges->len + 1);
+			g_array_index(ranges, struct enum_range, ranges->len) = iter->range;
+		}
+	}
+	if (!ranges) {
+		ranges = qs;
+		g_array_ref(ranges);
+	}
+	return ranges;
 }
 
+#if (__WORDSIZE == 32)
+static
 guint enum_val_hash(gconstpointer key)
 {
 	int64_t ukey = *(const int64_t *)key;
@@ -59,6 +127,7 @@ guint enum_val_hash(gconstpointer key)
 	return (guint)ukey ^ (guint)(ukey >> 32);
 }
 
+static
 gboolean enum_val_equal(gconstpointer a, gconstpointer b)
 {
 	int64_t ua = *(const int64_t *)a;
@@ -67,158 +136,323 @@ gboolean enum_val_equal(gconstpointer a, gconstpointer b)
 	return ua == ub;
 }
 
+static
 void enum_val_free(void *ptr)
 {
 	g_free(ptr);
 }
 
-void enum_signed_insert(struct type_class_enum *enum_class, int64_t v, GQuark q)
+static
+void enum_signed_insert_value_to_quark_set(struct declaration_enum *enum_declaration,
+			int64_t v, GQuark q)
 {
-	int64_t *valuep = g_new(int64_t, 1);
+	int64_t *valuep;
+	GArray *array;
 
-	g_hash_table_insert(enum_class->table.value_to_quark, valuep,
-			    (gpointer) (unsigned long) q);
-	g_hash_table_insert(enum_class->table.quark_to_value,
-			    (gpointer) (unsigned long) q,
-			    valuep);
+	array = g_hash_table_lookup(enum_declaration->table.value_to_quark_set, &v);
+	if (!array) {
+		array = g_array_sized_new(FALSE, TRUE, sizeof(GQuark), 1);
+		g_array_set_size(array, 1);
+		g_array_index(array, GQuark, array->len - 1) = q;
+		valuep = g_new(int64_t, 1);
+		*valuep = v;
+		g_hash_table_insert(enum_declaration->table.value_to_quark_set, valuep, array);
+	} else {
+		g_array_set_size(array, array->len + 1);
+		g_array_index(array, GQuark, array->len - 1) = q;
+	}
 }
 
-void enum_unsigned_insert(struct type_class_enum *enum_class, uint64_t v, GQuark q)
+static
+void enum_unsigned_insert_value_to_quark_set(struct declaration_enum *enum_declaration,
+			 uint64_t v, GQuark q)
 {
-	uint64_t *valuep = g_new(uint64_t, 1);
+	uint64_t *valuep;
+	GArray *array;
 
-	g_hash_table_insert(enum_class->table.value_to_quark, valuep,
-			    (gpointer) (unsigned long) q);
-	g_hash_table_insert(enum_class->table.quark_to_value,
-			    (gpointer) (unsigned long) q,
-			    valuep);
+	array = g_hash_table_lookup(enum_declaration->table.value_to_quark_set, &v);
+	if (!array) {
+		array = g_array_sized_new(FALSE, TRUE, sizeof(GQuark), 1);
+		g_array_set_size(array, 1);
+		g_array_index(array, GQuark, array->len - 1) = q;
+		valuep = g_new(uint64_t, 1);
+		*valuep = v;
+		g_hash_table_insert(enum_declaration->table.value_to_quark_set, valuep, array);
+	} else {
+		g_array_set_size(array, array->len + 1);
+		g_array_index(array, GQuark, array->len - 1) = q;
+	}
 }
-#else	/* __WORDSIZE != 32 */
-GQuark enum_uint_to_quark(const struct type_class_enum *enum_class, uint64_t v)
+#else  /* __WORDSIZE != 32 */
+static
+guint enum_val_hash(gconstpointer key)
 {
-	gconstpointer q = g_hash_table_lookup(enum_class->table.value_to_quark,
-					      (gconstpointer) v);
-	return (GQuark) (unsigned long) q;
+	return g_direct_hash(key);
 }
 
-GQuark enum_int_to_quark(const struct type_class_enum *enum_class, uint64_t v)
+static
+gboolean enum_val_equal(gconstpointer a, gconstpointer b)
 {
-	gconstpointer q = g_hash_table_lookup(enum_class->table.value_to_quark,
-					      (gconstpointer) v);
-	return (GQuark) (unsigned long) q;
+	return g_direct_equal(a, b);
 }
 
-uint64_t enum_quark_to_uint(const struct type_class_enum *enum_class,
-			    GQuark q)
+static
+void enum_val_free(void *ptr)
 {
-	gconstpointer v = g_hash_table_lookup(enum_class->table.quark_to_value,
-					      (gconstpointer) (unsigned long) q);
-	return *(const uint64_t *) v;
 }
 
-int64_t enum_quark_to_int(const struct type_class_enum *enum_class,
-			  GQuark q)
+static
+void enum_signed_insert_value_to_quark_set(struct declaration_enum *enum_declaration,
+			int64_t v, GQuark q)
 {
-	gconstpointer v = g_hash_table_lookup(enum_class->table.quark_to_value,
-					      (gconstpointer) (unsigned long) q);
-	return *(const int64_t *) v;
+	GArray *array;
+
+	array = g_hash_table_lookup(enum_declaration->table.value_to_quark_set,
+				    (gconstpointer) v);
+	if (!array) {
+		array = g_array_sized_new(FALSE, TRUE, sizeof(GQuark), 1);
+		g_array_set_size(array, 1);
+		g_array_index(array, GQuark, array->len - 1) = q;
+		g_hash_table_insert(enum_declaration->table.value_to_quark_set,
+				    (gpointer) v, array);
+	} else {
+		g_array_set_size(array, array->len + 1);
+		g_array_index(array, GQuark, array->len - 1) = q;
+	}
 }
 
-guint enum_val_hash(gconstpointer key)
+static
+void enum_unsigned_insert_value_to_quark_set(struct declaration_enum *enum_declaration,
+			 uint64_t v, GQuark q)
 {
-	return g_direct_hash(key);
+	GArray *array;
+
+	array = g_hash_table_lookup(enum_declaration->table.value_to_quark_set,
+				    (gconstpointer) v);
+	if (!array) {
+		array = g_array_sized_new(FALSE, TRUE, sizeof(GQuark), 1);
+		g_array_set_size(array, 1);
+		g_array_index(array, GQuark, array->len - 1) = q;
+		g_hash_table_insert(enum_declaration->table.value_to_quark_set,
+				    (gpointer) v, array);
+	} else {
+		g_array_set_size(array, array->len + 1);
+		g_array_index(array, GQuark, array->len - 1) = q;
+	}
 }
+#endif /* __WORDSIZE != 32 */
 
-gboolean enum_val_equal(gconstpointer a, gconstpointer b)
+GArray *enum_quark_to_range_set(const struct declaration_enum *enum_declaration,
+				GQuark q)
 {
-	return g_direct_equal(a, b);
+	return g_hash_table_lookup(enum_declaration->table.quark_to_range_set,
+				   (gconstpointer) (unsigned long) q);
 }
 
-void enum_val_free(void *ptr)
+static
+void enum_signed_insert_range_to_quark(struct declaration_enum *enum_declaration,
+                        int64_t start, int64_t end, GQuark q)
 {
+	struct enum_range_to_quark *rtoq;
+
+	rtoq = g_new(struct enum_range_to_quark, 1);
+	cds_list_add(&rtoq->node, &enum_declaration->table.range_to_quark);
+	rtoq->range.start._signed = start;
+	rtoq->range.end._signed = end;
+	rtoq->quark = q;
+}
+
+static
+void enum_unsigned_insert_range_to_quark(struct declaration_enum *enum_declaration,
+                        uint64_t start, uint64_t end, GQuark q)
+{
+	struct enum_range_to_quark *rtoq;
+
+	rtoq = g_new(struct enum_range_to_quark, 1);
+	cds_list_add(&rtoq->node, &enum_declaration->table.range_to_quark);
+	rtoq->range.start._unsigned = start;
+	rtoq->range.end._unsigned = end;
+	rtoq->quark = q;
+}
+
+void enum_signed_insert(struct declaration_enum *enum_declaration,
+                        int64_t start, int64_t end, GQuark q)
+{
+	GArray *array;
+	struct enum_range *range;
+
+	if (start == end) {
+		enum_signed_insert_value_to_quark_set(enum_declaration, start, q);
+	} else {
+		if (start > end) {
+			uint64_t tmp;
+
+			tmp = start;
+			start = end;
+			end = tmp;
+		}
+		enum_signed_insert_range_to_quark(enum_declaration, start, end, q);
+	}
+
+	array = g_hash_table_lookup(enum_declaration->table.quark_to_range_set,
+				    (gconstpointer) (unsigned long) q);
+	if (!array) {
+		array = g_array_sized_new(FALSE, TRUE,
+					  sizeof(struct enum_range), 1);
+		g_hash_table_insert(enum_declaration->table.quark_to_range_set,
+				    (gpointer) (unsigned long) q,
+				    array);
+	}
+	g_array_set_size(array, array->len + 1);
+	range = &g_array_index(array, struct enum_range, array->len - 1);
+	range->start._signed = start;
+	range->end._signed = end;
 }
 
-void enum_signed_insert(struct type_class_enum *enum_class,
-                        int64_t v, GQuark q)
+void enum_unsigned_insert(struct declaration_enum *enum_declaration,
+			  uint64_t start, uint64_t end, GQuark q)
 {
-	g_hash_table_insert(enum_class->table.value_to_quark, (gpointer) v,
-			    (gpointer) (unsigned long) q);
-	g_hash_table_insert(enum_class->table.quark_to_value,
-			    (gpointer) (unsigned long) q,
-			    (gpointer) v);
+	GArray *array;
+	struct enum_range *range;
+
+
+	if (start == end) {
+		enum_unsigned_insert_value_to_quark_set(enum_declaration, start, q);
+	} else {
+		if (start > end) {
+			uint64_t tmp;
+
+			tmp = start;
+			start = end;
+			end = tmp;
+		}
+		enum_unsigned_insert_range_to_quark(enum_declaration, start, end, q);
+	}
+
+	array = g_hash_table_lookup(enum_declaration->table.quark_to_range_set,
+				    (gconstpointer) (unsigned long) q);
+	if (!array) {
+		array = g_array_sized_new(FALSE, TRUE,
+					  sizeof(struct enum_range), 1);
+		g_hash_table_insert(enum_declaration->table.quark_to_range_set,
+				    (gpointer) (unsigned long) q,
+				    array);
+	}
+	g_array_set_size(array, array->len + 1);
+	range = &g_array_index(array, struct enum_range, array->len - 1);
+	range->start._unsigned = start;
+	range->end._unsigned = end;
 }
 
-void enum_unsigned_insert(struct type_class_enum *enum_class,
-			  uint64_t v, GQuark q)
+size_t enum_get_nr_enumerators(struct declaration_enum *enum_declaration)
 {
-	g_hash_table_insert(enum_class->table.value_to_quark, (gpointer) v,
-			    (gpointer) (unsigned long) q);
-	g_hash_table_insert(enum_class->table.quark_to_value,
-			    (gpointer) (unsigned long) q,
-			    (gpointer) v);
+	return g_hash_table_size(enum_declaration->table.quark_to_range_set);
 }
-#endif	/* __WORDSIZE != 32 */
 
 void enum_copy(struct stream_pos *dest, const struct format *fdest, 
 	       struct stream_pos *src, const struct format *fsrc,
-	       const struct type_class *type_class)
+	       struct definition *definition)
 {
-	struct type_class_enum *enum_class =
-		container_of(type_class, struct type_class_enum, p.p);
-	struct type_class_integer *int_class = &enum_class->p;
+	struct definition_enum *_enum =
+		container_of(definition, struct definition_enum, p);
+	struct declaration_enum *enum_declaration= _enum->declaration;
+	GArray *array;
 	GQuark v;
 
-	v = fsrc->enum_read(src, enum_class);
-	return fdest->enum_write(dest, enum_class, v);
+	array = fsrc->enum_read(src, enum_declaration);
+	assert(array);
+	/* unref previous array */
+	if (_enum->value)
+		g_array_unref(_enum->value);
+	_enum->value = array;
+	/*
+	 * Arbitrarily choose the first one.
+	 * TODO: use direct underlying declaration read/write intead. Not doing it for
+	 * now to test enum read and write code.
+	 */
+	v = g_array_index(array, GQuark, 0);
+	return fdest->enum_write(dest, enum_declaration, v);
 }
 
-void enum_type_free(struct type_class_enum *enum_class)
+static
+void _enum_declaration_free(struct declaration *declaration)
 {
-	g_hash_table_destroy(enum_class->table.value_to_quark);
-	g_hash_table_destroy(enum_class->table.quark_to_value);
-	g_free(enum_class);
+	struct declaration_enum *enum_declaration =
+		container_of(declaration, struct declaration_enum, p);
+	struct enum_range_to_quark *iter, *tmp;
+
+	g_hash_table_destroy(enum_declaration->table.value_to_quark_set);
+	cds_list_for_each_entry_safe(iter, tmp, &enum_declaration->table.range_to_quark, node) {
+		cds_list_del(&iter->node);
+		g_free(iter);
+	}
+	g_hash_table_destroy(enum_declaration->table.quark_to_range_set);
+	declaration_unref(&enum_declaration->integer_declaration->p);
+	g_free(enum_declaration);
+}
+
+struct declaration_enum *
+	enum_declaration_new(struct declaration_integer *integer_declaration)
+{
+	struct declaration_enum *enum_declaration;
+
+	enum_declaration = g_new(struct declaration_enum, 1);
+
+	enum_declaration->table.value_to_quark_set = g_hash_table_new_full(enum_val_hash,
+							    enum_val_equal,
+							    enum_val_free,
+							    enum_range_set_free);
+	CDS_INIT_LIST_HEAD(&enum_declaration->table.range_to_quark);
+	enum_declaration->table.quark_to_range_set = g_hash_table_new_full(g_int_hash,
+							g_int_equal,
+							NULL, enum_range_set_free);
+	declaration_ref(&integer_declaration->p);
+	enum_declaration->integer_declaration = integer_declaration;
+	enum_declaration->p.id = CTF_TYPE_ENUM;
+	enum_declaration->p.alignment = 1;
+	enum_declaration->p.copy = enum_copy;
+	enum_declaration->p.declaration_free = _enum_declaration_free;
+	enum_declaration->p.definition_new = _enum_definition_new;
+	enum_declaration->p.definition_free = _enum_definition_free;
+	enum_declaration->p.ref = 1;
+	return enum_declaration;
 }
 
 static
-void _enum_type_free(struct type_class *type_class)
+struct definition *
+	_enum_definition_new(struct declaration *declaration,
+			     struct definition_scope *parent_scope,
+			     GQuark field_name, int index)
 {
-	struct type_class_enum *enum_class =
-		container_of(type_class, struct type_class_enum, p.p);
-	enum_type_free(enum_class);
+	struct declaration_enum *enum_declaration =
+		container_of(declaration, struct declaration_enum, p);
+	struct definition_enum *_enum;
+	struct definition *definition_integer_parent;
+
+	_enum = g_new(struct definition_enum, 1);
+	declaration_ref(&enum_declaration->p);
+	_enum->p.declaration = declaration;
+	_enum->declaration = enum_declaration;
+	_enum->p.ref = 1;
+	_enum->p.index = index;
+	_enum->value = NULL;
+	definition_integer_parent =
+		enum_declaration->integer_declaration->p.definition_new(&enum_declaration->integer_declaration->p,
+					parent_scope, field_name, 0);
+	_enum->integer = container_of(definition_integer_parent,
+				      struct definition_integer, p);
+	return &_enum->p;
 }
 
-struct type_class_enum *enum_type_new(const char *name,
-				      size_t len, int byte_order,
-				      int signedness,
-				      size_t alignment)
+static
+void _enum_definition_free(struct definition *definition)
 {
-	struct type_class_enum *enum_class;
-	struct type_class_integer *int_class;
-	int ret;
+	struct definition_enum *_enum =
+		container_of(definition, struct definition_enum, p);
 
-	enum_class = g_new(struct type_class_enum, 1);
-	enum_class->table.value_to_quark = g_hash_table_new(enum_val_hash,
-							    enum_val_equal);
-	enum_class->table.quark_to_value = g_hash_table_new_full(g_direct_hash,
-							g_direct_equal,
-							NULL, enum_val_free);
-	int_class = &enum_class->p;
-	int_class->p.name = g_quark_from_string(name);
-	int_class->p.alignment = alignment;
-	int_class->p.copy = enum_copy;
-	int_class->p.free = _enum_type_free;
-	int_class->p.ref = 1;
-	int_class->len = len;
-	int_class->byte_order = byte_order;
-	int_class->signedness = signedness;
-	if (int_class->p.name) {
-		ret = register_type(&int_class->p);
-		if (ret) {
-			g_hash_table_destroy(enum_class->table.value_to_quark);
-			g_hash_table_destroy(enum_class->table.quark_to_value);
-			g_free(enum_class);
-			return NULL;
-		}
-	}
-	return enum_class;
+	definition_unref(&_enum->integer->p);
+	declaration_unref(_enum->p.declaration);
+	if (_enum->value)
+		g_array_unref(_enum->value);
+	g_free(_enum);
 }