#include <babeltrace/compiler.h>
#include <babeltrace/format.h>
+#include <inttypes.h>
static
struct definition *_array_definition_new(struct declaration *declaration,
- struct definition_scope *parent_scope);
+ struct definition_scope *parent_scope,
+ GQuark field_name, int index);
static
void _array_definition_free(struct definition *definition);
-void array_copy(struct stream_pos *dest, const struct format *fdest,
- struct stream_pos *src, const struct format *fsrc,
- struct definition *definition)
+int array_rw(struct stream_pos *pos, struct definition *definition)
{
- struct definition_array *array =
+ struct definition_array *array_definition =
container_of(definition, struct definition_array, p);
- struct declaration_array *array_declaration = array->declaration;
+ const struct declaration_array *array_declaration =
+ array_definition->declaration;
uint64_t i;
+ int ret;
- fsrc->array_begin(src, array_declaration);
- fdest->array_begin(dest, array_declaration);
-
+ /* No need to align, because the first field will align itself. */
for (i = 0; i < array_declaration->len; i++) {
- struct definition *elem = array->current_element.definition;
- elem->declaration->copy(dest, fdest, src, fsrc, elem);
+ struct definition *field =
+ g_ptr_array_index(array_definition->elems, i);
+ ret = generic_rw(pos, field);
+ if (ret)
+ return ret;
}
- fsrc->array_end(src, array_declaration);
- fdest->array_end(dest, array_declaration);
+ return 0;
}
static
}
struct declaration_array *
- array_declaration_new(const char *name, size_t len,
+ array_declaration_new(size_t len,
struct declaration *elem_declaration,
struct declaration_scope *parent_scope)
{
array_declaration->elem = elem_declaration;
array_declaration->scope = new_declaration_scope(parent_scope);
declaration->id = CTF_TYPE_ARRAY;
- declaration->name = g_quark_from_string(name);
/* No need to align the array, the first element will align itself */
declaration->alignment = 1;
- declaration->copy = array_copy;
declaration->declaration_free = _array_declaration_free;
declaration->definition_new = _array_definition_new;
declaration->definition_free = _array_definition_free;
static
struct definition *
_array_definition_new(struct declaration *declaration,
- struct definition_scope *parent_scope)
+ struct definition_scope *parent_scope,
+ GQuark field_name, int index)
{
struct declaration_array *array_declaration =
container_of(declaration, struct declaration_array, p);
struct definition_array *array;
+ uint64_t i;
array = g_new(struct definition_array, 1);
declaration_ref(&array_declaration->p);
array->p.declaration = declaration;
array->declaration = array_declaration;
array->p.ref = 1;
- array->scope = new_definition_scope(parent_scope);
- array->current_element.definition =
- array_declaration->elem->definition_new(array_declaration->elem,
- parent_scope);
+ array->p.index = index;
+ array->p.name = field_name;
+ array->p.path = new_definition_path(parent_scope, field_name);
+ array->scope = new_definition_scope(parent_scope, field_name);
+ array->elems = g_ptr_array_sized_new(array_declaration->len);
+ g_ptr_array_set_size(array->elems, array_declaration->len);
+ for (i = 0; i < array_declaration->len; i++) {
+ struct definition **field;
+ GString *str;
+ GQuark name;
+
+ str = g_string_new("");
+ g_string_printf(str, "[%" PRIu64 "]", i);
+ name = g_quark_from_string(str->str);
+ (void) g_string_free(str, TRUE);
+
+ field = (struct definition **) &g_ptr_array_index(array->elems, i);
+ *field = array_declaration->elem->definition_new(array_declaration->elem,
+ array->scope,
+ name, i);
+ }
return &array->p;
}
{
struct definition_array *array =
container_of(definition, struct definition_array, p);
- struct definition *elem_definition =
- array->current_element.definition;
+ uint64_t i;
- elem_definition->declaration->definition_free(elem_definition);
+ for (i = 0; i < array->elems->len; i++) {
+ struct definition *field;
+
+ field = g_ptr_array_index(array->elems, i);
+ field->declaration->definition_free(field);
+ }
+ (void) g_ptr_array_free(array->elems, TRUE);
free_definition_scope(array->scope);
declaration_unref(array->p.declaration);
g_free(array);
}
+
+uint64_t array_len(struct definition_array *array)
+{
+ return array->elems->len;
+}
+
+struct definition *array_index(struct definition_array *array, uint64_t i)
+{
+ if (i >= array->elems->len)
+ return NULL;
+ return g_ptr_array_index(array->elems, i);
+}