X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fenum.c;h=4e3cc45c7849dbc93168bdfbbf725e82c6ff0a12;hp=6fcbe683a9ab12a9c11042e5c2c809332dd3cca8;hb=474150688a81e2bc487aaa9932af6a0585e5fb79;hpb=bcdf4cf28bb5517137c074801b949fc641141e6c diff --git a/types/enum.c b/types/enum.c index 6fcbe683..4e3cc45c 100644 --- a/types/enum.c +++ b/types/enum.c @@ -3,7 +3,9 @@ * * BabelTrace - Enumeration Type * - * Copyright 2010, 2011 - Mathieu Desnoyers + * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation + * + * Author: Mathieu Desnoyers * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -18,9 +20,18 @@ #include #include +#include #include #include +#if (__LONG_MAX__ == 2147483647L) +#define WORD_SIZE 32 +#elif (__LONG_MAX__ == 9223372036854775807L) +#define WORD_SIZE 64 +#else +#error "Unknown long size." +#endif + static struct definition *_enum_definition_new(struct declaration *declaration, struct definition_scope *parent_scope, @@ -35,7 +46,7 @@ void enum_range_set_free(void *ptr) g_array_unref(ptr); } -#if (__WORDSIZE == 32) +#if (WORD_SIZE == 32) static inline gpointer get_uint_v(uint64_t *v) { @@ -70,7 +81,7 @@ void enum_val_free(void *ptr) { g_free(ptr); } -#else /* __WORDSIZE != 32 */ +#else /* WORD_SIZE != 32 */ static inline gpointer get_uint_v(uint64_t *v) { @@ -99,7 +110,7 @@ static void enum_val_free(void *ptr) { } -#endif /* __WORDSIZE != 32 */ +#endif /* WORD_SIZE != 32 */ /* * Returns a GArray or NULL. @@ -116,7 +127,7 @@ GArray *enum_uint_to_quark_set(const struct declaration_enum *enum_declaration, get_uint_v(&v)); /* Range lookup */ - cds_list_for_each_entry(iter, &enum_declaration->table.range_to_quark, node) { + 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) { @@ -125,18 +136,18 @@ GArray *enum_uint_to_quark_set(const struct declaration_enum *enum_declaration, if (qs) qs_len = qs->len; ranges = g_array_sized_new(FALSE, TRUE, - sizeof(struct enum_range), + sizeof(GQuark), 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; + 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, struct enum_range, qs_len) = iter->range; + g_array_index(ranges, GQuark, qs_len) = iter->quark; } } if (!ranges) { @@ -163,7 +174,7 @@ GArray *enum_int_to_quark_set(const struct declaration_enum *enum_declaration, get_int_v(&v)); /* Range lookup */ - cds_list_for_each_entry(iter, &enum_declaration->table.range_to_quark, node) { + 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) { @@ -172,18 +183,18 @@ GArray *enum_int_to_quark_set(const struct declaration_enum *enum_declaration, if (qs) qs_len = qs->len; ranges = g_array_sized_new(FALSE, TRUE, - sizeof(struct enum_range), + sizeof(GQuark), 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; + 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, struct enum_range, qs_len) = iter->range; + g_array_index(ranges, GQuark, qs_len) = iter->quark; } } if (!ranges) { @@ -208,12 +219,12 @@ void enum_unsigned_insert_value_to_quark_set(struct declaration_enum *enum_decla 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 (__WORDSIZE == 32) +#if (WORD_SIZE == 32) valuep = g_new(uint64_t, 1); *valuep = v; -#else /* __WORDSIZE != 32 */ +#else /* WORD_SIZE != 32 */ valuep = get_uint_v(&v); -#endif /* __WORDSIZE != 32 */ +#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); @@ -234,12 +245,12 @@ void enum_signed_insert_value_to_quark_set(struct declaration_enum *enum_declara 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 (__WORDSIZE == 32) +#if (WORD_SIZE == 32) valuep = g_new(int64_t, 1); *valuep = v; -#else /* __WORDSIZE != 32 */ +#else /* WORD_SIZE != 32 */ valuep = get_int_v(&v); -#endif /* __WORDSIZE != 32 */ +#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); @@ -261,7 +272,7 @@ void enum_signed_insert_range_to_quark(struct declaration_enum *enum_declaration 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); + bt_list_add(&rtoq->node, &enum_declaration->table.range_to_quark); rtoq->range.start._signed = start; rtoq->range.end._signed = end; rtoq->quark = q; @@ -274,7 +285,7 @@ void enum_unsigned_insert_range_to_quark(struct declaration_enum *enum_declarati 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); + bt_list_add(&rtoq->node, &enum_declaration->table.range_to_quark); rtoq->range.start._unsigned = start; rtoq->range.end._unsigned = end; rtoq->quark = q; @@ -362,8 +373,8 @@ void _enum_declaration_free(struct declaration *declaration) 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); + 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); @@ -382,7 +393,7 @@ struct declaration_enum * enum_val_equal, enum_val_free, enum_range_set_free); - CDS_INIT_LIST_HEAD(&enum_declaration->table.range_to_quark); + 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_range_set_free);