X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fenum.c;h=8394e1b35b70b4e2c58b2a9d9ed97d1293eb2c3c;hp=0fbc19187ef9e487914fd7540e07e7346fbf8145;hb=4a6f6ed3aeb9845dec4b8ec9ca8573ed1c064187;hpb=90b676d73fc6f817958083c0f159028a2f0b40ca diff --git a/types/enum.c b/types/enum.c index 0fbc1918..8394e1b3 100644 --- a/types/enum.c +++ b/types/enum.c @@ -1,64 +1,73 @@ /* + * enum.c + * * BabelTrace - Enumeration Type * - * Copyright (c) 2010 Mathieu Desnoyers + * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation + * + * Author: Mathieu Desnoyers * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #include +#include #include #include #include -struct enum_table { - GHashTable *value_to_quark; /* Tuples (value, GQuark) */ - GHashTable *quark_to_value; /* Tuples (GQuark, value) */ -}; +#if (__LONG_MAX__ == 2147483647L) +#define WORD_SIZE 32 +#elif (__LONG_MAX__ == 9223372036854775807L) +#define WORD_SIZE 64 +#else +#error "Unknown long size." +#endif -#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 bt_definition *_enum_definition_new(struct bt_declaration *declaration, + struct definition_scope *parent_scope, + GQuark field_name, int index, + const char *root_name); +static +void _enum_definition_free(struct bt_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, - size_t len, int byte_order, GQuark q) +#if (WORD_SIZE == 32) +static inline +gpointer get_uint_v(uint64_t *v) { - gconstpointer v = g_hash_table_lookup(enum_class->table.quark_to_value, - (gconstpointer) q); - return *(const uint64_t *) v; + return v; } -int64_t enum_quark_to_int(const struct type_class_enum *enum_class, - size_t len, int byte_order, GQuark q) +static inline +gpointer get_int_v(int64_t *v) { - gconstpointer v = g_hash_table_lookup(enum_class->table.quark_to_value, - (gconstpointer) q); - return *(const int64_t *) v; + return v; } +static guint enum_val_hash(gconstpointer key) { int64_t ukey = *(const int64_t *)key; @@ -66,6 +75,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; @@ -74,162 +84,387 @@ 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) +#else /* WORD_SIZE != 32 */ +static inline +gpointer get_uint_v(uint64_t *v) { - int64_t *valuep = g_new(int64_t, 1); + return (gpointer) *v; +} - 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); +static inline +gpointer get_int_v(int64_t *v) +{ + return (gpointer) *v; } -void enum_unsigned_insert(struct type_class_enum *enum_class, uint64_t v, GQuark q) +static +guint enum_val_hash(gconstpointer key) { - uint64_t *valuep = g_new(uint64_t, 1); + return g_direct_hash(key); +} - 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); +static +gboolean enum_val_equal(gconstpointer a, gconstpointer b) +{ + return g_direct_equal(a, b); } -#else /* __WORDSIZE != 32 */ -GQuark enum_uint_to_quark(const struct type_class_enum *enum_class, uint64_t v) + +static +void enum_val_free(void *ptr) { - gconstpointer q = g_hash_table_lookup(enum_class->table.value_to_quark, - (gconstpointer) v); - return (GQuark) (unsigned long) q; } +#endif /* WORD_SIZE != 32 */ -GQuark enum_int_to_quark(const struct type_class_enum *enum_class, uint64_t v) +/* + * Returns a GArray or NULL. + * Caller must release the GArray with g_array_unref(). + */ +GArray *bt_enum_uint_to_quark_set(const struct declaration_enum *enum_declaration, + uint64_t v) { - gconstpointer q = g_hash_table_lookup(enum_class->table.value_to_quark, - (gconstpointer) v); - return (GQuark) (unsigned long) q; + 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, + get_uint_v(&v)); + + /* Range lookup */ + bt_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(GQuark), + qs_len + 1); + g_array_set_size(ranges, qs_len + 1); + if (qs) + memcpy(ranges->data, qs->data, + sizeof(GQuark) * qs_len); + g_array_index(ranges, GQuark, qs_len) = iter->quark; + } else { + size_t qs_len = ranges->len; + + g_array_set_size(ranges, qs_len + 1); + g_array_index(ranges, GQuark, qs_len) = iter->quark; + } + } + if (!ranges) { + if (!qs) + return NULL; + ranges = qs; + g_array_ref(ranges); + } + return ranges; } -uint64_t enum_quark_to_uint(const struct type_class_enum *enum_class, - size_t len, int byte_order, GQuark q) +/* + * Returns a GArray or NULL. + * Caller must release the GArray with g_array_unref(). + */ +GArray *bt_enum_int_to_quark_set(const struct declaration_enum *enum_declaration, + int64_t v) { - gconstpointer v = g_hash_table_lookup(enum_class->table.quark_to_value, - (gconstpointer) (unsigned long) 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, + get_int_v(&v)); + + /* Range lookup */ + bt_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(GQuark), + qs_len + 1); + g_array_set_size(ranges, qs_len + 1); + if (qs) + memcpy(ranges->data, qs->data, + sizeof(GQuark) * qs_len); + g_array_index(ranges, GQuark, qs_len) = iter->quark; + } else { + size_t qs_len = ranges->len; + + g_array_set_size(ranges, qs_len + 1); + g_array_index(ranges, GQuark, qs_len) = iter->quark; + } + } + if (!ranges) { + if (!qs) + return NULL; + ranges = qs; + g_array_ref(ranges); + } + return ranges; } -int64_t enum_quark_to_int(const struct type_class_enum *enum_class, - size_t len, int byte_order, GQuark q) +static +void bt_enum_unsigned_insert_value_to_quark_set(struct declaration_enum *enum_declaration, + uint64_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; + uint64_t *valuep; + GArray *array; + + array = g_hash_table_lookup(enum_declaration->table.value_to_quark_set, + get_uint_v(&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; +#if (WORD_SIZE == 32) + valuep = g_new(uint64_t, 1); + *valuep = v; +#else /* WORD_SIZE != 32 */ + valuep = get_uint_v(&v); +#endif /* WORD_SIZE != 32 */ + 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; + } } -guint enum_val_hash(gconstpointer key) +static +void bt_enum_signed_insert_value_to_quark_set(struct declaration_enum *enum_declaration, + int64_t v, GQuark q) { - return g_direct_hash(key); + int64_t *valuep; + GArray *array; + + array = g_hash_table_lookup(enum_declaration->table.value_to_quark_set, + get_int_v(&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; +#if (WORD_SIZE == 32) + valuep = g_new(int64_t, 1); + *valuep = v; +#else /* WORD_SIZE != 32 */ + valuep = get_int_v(&v); +#endif /* WORD_SIZE != 32 */ + 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; + } } -gboolean enum_val_equal(gconstpointer a, gconstpointer b) +GArray *bt_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 bt_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); + bt_list_add(&rtoq->node, &enum_declaration->table.range_to_quark); + rtoq->range.start._signed = start; + rtoq->range.end._signed = end; + rtoq->quark = q; } -void enum_signed_insert(struct type_class_enum *enum_class, - int64_t v, GQuark q) +static +void bt_enum_unsigned_insert_range_to_quark(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, - valuep); + struct enum_range_to_quark *rtoq; + + rtoq = g_new(struct enum_range_to_quark, 1); + bt_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_unsigned_insert(struct type_class_enum *enum_class, - uint64_t v, GQuark q) +void bt_enum_signed_insert(struct declaration_enum *enum_declaration, + int64_t start, int64_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, - valuep); + GArray *array; + struct enum_range *range; + + if (start == end) { + bt_enum_signed_insert_value_to_quark_set(enum_declaration, start, q); + } else { + if (start > end) { + uint64_t tmp; + + tmp = start; + start = end; + end = tmp; + } + bt_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; } -#endif /* __WORDSIZE != 32 */ -size_t enum_copy(unsigned char *dest, const struct format *fdest, - const unsigned char *src, const struct format *fsrc, - const struct type_class *type_class) +void bt_enum_unsigned_insert(struct declaration_enum *enum_declaration, + uint64_t start, uint64_t end, GQuark q) { - struct type_class_enum *enum_class = - container_of(type_class, struct type_class_enum, p); - struct type_class_bitfield *bitfield_class = &enum_class->p; - struct type_class_integer *int_class = &bitfield_class->p; - GQuark v; + GArray *array; + struct enum_range *range; + + + if (start == end) { + bt_enum_unsigned_insert_value_to_quark_set(enum_declaration, start, q); + } else { + if (start > end) { + uint64_t tmp; - v = fsrc->enum_read(src, enum_class) - return fdest->enum_write(dest, enum_class, v); + tmp = start; + start = end; + end = tmp; + } + bt_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_type_free(struct type_class_enum *enum_class) +size_t bt_enum_get_nr_enumerators(struct declaration_enum *enum_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); + return g_hash_table_size(enum_declaration->table.quark_to_range_set); } static -void _enum_type_free(struct type_class *type_class) +void _enum_declaration_free(struct bt_declaration *declaration) { - struct type_class_enum *enum_class = - container_of(type_class, struct type_class_enum, p); - enum_type_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); + bt_list_for_each_entry_safe(iter, tmp, &enum_declaration->table.range_to_quark, node) { + bt_list_del(&iter->node); + g_free(iter); + } + g_hash_table_destroy(enum_declaration->table.quark_to_range_set); + bt_declaration_unref(&enum_declaration->integer_declaration->p); + g_free(enum_declaration); } -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) +struct declaration_enum * + bt_enum_declaration_new(struct declaration_integer *integer_declaration) { - struct type_class_bitfield *bitfield_class; - struct type_class_integer *int_class; - int ret; + struct declaration_enum *enum_declaration; + + enum_declaration = g_new(struct declaration_enum, 1); - enum_class = g_new(struct type_class_bitfield, 1); - enum_class->table.value_to_quark = g_hash_table(enum_val_hash, - enum_val_equal); - enum_class->table.quark_to_value = g_hash_table_new_full(g_direct_hash, + 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); + BT_INIT_LIST_HEAD(&enum_declaration->table.range_to_quark); + enum_declaration->table.quark_to_range_set = g_hash_table_new_full(g_direct_hash, g_direct_equal, - NULL, enum_val_free); - bitfield_class = &enum_class->p; - bitfield_class->start_offset = start_offset; - int_class = &bitfield_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->len = len; - int_class->byte_order = byte_order; - int_class->signedness = signedness; - bitfield_class->start_offset = start_offset; - 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; + NULL, enum_range_set_free); + bt_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.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 +struct bt_definition * + _enum_definition_new(struct bt_declaration *declaration, + struct definition_scope *parent_scope, + GQuark field_name, int index, + const char *root_name) +{ + struct declaration_enum *enum_declaration = + container_of(declaration, struct declaration_enum, p); + struct definition_enum *_enum; + struct bt_definition *definition_integer_parent; + int ret; + + _enum = g_new(struct definition_enum, 1); + bt_declaration_ref(&enum_declaration->p); + _enum->p.declaration = declaration; + _enum->declaration = enum_declaration; + _enum->p.ref = 1; + /* + * Use INT_MAX order to ensure that all fields of the parent + * scope are seen as being prior to this scope. + */ + _enum->p.index = root_name ? INT_MAX : index; + _enum->p.name = field_name; + _enum->p.path = bt_new_definition_path(parent_scope, field_name, root_name); + _enum->p.scope = bt_new_definition_scope(parent_scope, field_name, root_name); + _enum->value = NULL; + ret = bt_register_field_definition(field_name, &_enum->p, + parent_scope); + assert(!ret); + definition_integer_parent = + enum_declaration->integer_declaration->p.definition_new(&enum_declaration->integer_declaration->p, + _enum->p.scope, + g_quark_from_static_string("container"), 0, NULL); + _enum->integer = container_of(definition_integer_parent, + struct definition_integer, p); + return &_enum->p; +} + +static +void _enum_definition_free(struct bt_definition *definition) +{ + struct definition_enum *_enum = + container_of(definition, struct definition_enum, p); + + bt_definition_unref(&_enum->integer->p); + bt_free_definition_scope(_enum->p.scope); + bt_declaration_unref(_enum->p.declaration); + if (_enum->value) + g_array_unref(_enum->value); + g_free(_enum); }