*
* Enumeration mapping strings (quarks) from/to integers.
*
- * 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/ctf/types.h>
+#include <inttypes.h>
#include <stdint.h>
#include <glib.h>
-/*
- * The caller should unref the GArray.
- */
-GArray *ctf_enum_read(struct stream_pos *pos,
- const struct type_class_enum *src)
+int ctf_enum_read(struct stream_pos *ppos, struct definition *definition)
{
- const struct type_class_integer *int_class = &src->p;
+ struct definition_enum *enum_definition =
+ container_of(definition, struct definition_enum, p);
+ const struct declaration_enum *enum_declaration =
+ enum_definition->declaration;
+ struct definition_integer *integer_definition =
+ enum_definition->integer;
+ const struct declaration_integer *integer_declaration =
+ integer_definition->declaration;
+ GArray *qs;
+ int ret;
- if (!int_class->signedness) {
- uint64_t v;
-
- v = ctf_uint_read(pos, int_class);
- return enum_uint_to_quark_set(src, v);
+ ret = ctf_integer_read(ppos, &integer_definition->p);
+ if (ret)
+ return ret;
+ if (!integer_declaration->signedness) {
+ qs = enum_uint_to_quark_set(enum_declaration,
+ integer_definition->value._unsigned);
+ if (!qs) {
+ fprintf(stderr, "[warning] Unknown value %" PRIu64 " in enum.\n",
+ integer_definition->value._unsigned);
+ }
} else {
- int64_t v;
-
- v = ctf_int_read(pos, int_class);
- return enum_int_to_quark_set(src, v);
+ qs = enum_int_to_quark_set(enum_declaration,
+ integer_definition->value._signed);
+ if (!qs) {
+ fprintf(stderr, "[warning] Unknown value %" PRId64 " in enum.\n",
+ integer_definition->value._signed);
+ }
}
+ /* unref previous quark set */
+ if (enum_definition->value)
+ g_array_unref(enum_definition->value);
+ enum_definition->value = qs;
+ return 0;
}
-/*
- * Arbitrarily choose the start of the first matching range.
- */
-void ctf_enum_write(struct stream_pos *pos,
- const struct type_class_enum *dest,
- GQuark q)
+int ctf_enum_write(struct stream_pos *pos, struct definition *definition)
{
- const struct type_class_integer *int_class = &dest->p;
- GArray *array;
-
- array = enum_quark_to_range_set(dest, q);
- assert(array);
+ struct definition_enum *enum_definition =
+ container_of(definition, struct definition_enum, p);
+ struct definition_integer *integer_definition =
+ enum_definition->integer;
- if (!int_class->signedness) {
- uint64_t v = g_array_index(array, struct enum_range, 0).start._unsigned;
- ctf_uint_write(pos, int_class, v);
- } else {
- int64_t v = g_array_index(array, struct enum_range, 0).start._unsigned;
- ctf_int_write(pos, int_class, v);
- }
+ return ctf_integer_write(pos, &integer_definition->p);
}