*
* BabelTrace - Enumeration Type
*
- * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: 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
#include <babeltrace/compiler.h>
#include <babeltrace/format.h>
+#include <babeltrace/types.h>
#include <stdint.h>
#include <glib.h>
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) {
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) {
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) {
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) {
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;
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;
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);
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);