*
* BabelTrace - Structure Type Converter
*
- * 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 <errno.h>
#ifndef max
#define max(a, b) ((a) < (b) ? (b) : (a))
static
struct definition *_struct_definition_new(struct declaration *declaration,
struct definition_scope *parent_scope,
- GQuark field_name, int index);
+ GQuark field_name, int index,
+ const char *root_name);
static
void _struct_definition_free(struct definition *definition);
-void struct_rw(struct stream_pos *ppos, struct definition *definition)
+int struct_rw(struct stream_pos *ppos, struct definition *definition)
{
struct definition_struct *struct_definition =
container_of(definition, struct definition_struct, p);
unsigned long i;
+ int ret;
for (i = 0; i < struct_definition->fields->len; i++) {
- struct field *field = &g_array_index(struct_definition->fields,
- struct field, i);
- generic_rw(ppos, field->definition);
+ struct definition *field =
+ g_ptr_array_index(struct_definition->fields, i);
+ ret = generic_rw(ppos, field);
+ if (ret)
+ return ret;
}
+ return 0;
}
static
}
struct declaration_struct *
- struct_declaration_new(struct declaration_scope *parent_scope)
+ struct_declaration_new(struct declaration_scope *parent_scope,
+ uint64_t min_align)
{
struct declaration_struct *struct_declaration;
struct declaration *declaration;
DEFAULT_NR_STRUCT_FIELDS);
struct_declaration->scope = new_declaration_scope(parent_scope);
declaration->id = CTF_TYPE_STRUCT;
- declaration->alignment = 1;
+ declaration->alignment = max(1, min_align);
declaration->declaration_free = _struct_declaration_free;
declaration->definition_new = _struct_definition_new;
declaration->definition_free = _struct_definition_free;
struct definition *
_struct_definition_new(struct declaration *declaration,
struct definition_scope *parent_scope,
- GQuark field_name, int index)
+ GQuark field_name, int index,
+ const char *root_name)
{
struct declaration_struct *struct_declaration =
container_of(declaration, struct declaration_struct, p);
struct definition_struct *_struct;
- unsigned long i;
+ int i;
int ret;
_struct = g_new(struct definition_struct, 1);
_struct->p.declaration = declaration;
_struct->declaration = struct_declaration;
_struct->p.ref = 1;
- _struct->p.index = index;
- _struct->scope = new_definition_scope(parent_scope, field_name);
- _struct->fields = g_array_sized_new(FALSE, TRUE,
- sizeof(struct field),
- DEFAULT_NR_STRUCT_FIELDS);
- g_array_set_size(_struct->fields, struct_declaration->fields->len);
+ /*
+ * Use INT_MAX order to ensure that all fields of the parent
+ * scope are seen as being prior to this scope.
+ */
+ _struct->p.index = root_name ? INT_MAX : index;
+ _struct->p.name = field_name;
+ _struct->p.path = new_definition_path(parent_scope, field_name, root_name);
+ _struct->p.scope = new_definition_scope(parent_scope, field_name, root_name);
+
+ ret = register_field_definition(field_name, &_struct->p,
+ parent_scope);
+ assert(!ret || ret == -EPERM);
+
+ _struct->fields = g_ptr_array_sized_new(DEFAULT_NR_STRUCT_FIELDS);
+ g_ptr_array_set_size(_struct->fields, struct_declaration->fields->len);
for (i = 0; i < struct_declaration->fields->len; i++) {
struct declaration_field *declaration_field =
&g_array_index(struct_declaration->fields,
struct declaration_field, i);
- struct field *field = &g_array_index(_struct->fields,
- struct field, i);
-
- field->name = declaration_field->name;
- field->definition =
- declaration_field->declaration->definition_new(declaration_field->declaration,
- _struct->scope,
- field->name, i);
- ret = register_field_definition(field->name,
- field->definition,
- _struct->scope);
- assert(!ret);
+ struct definition **field =
+ (struct definition **) &g_ptr_array_index(_struct->fields, i);
+
+ *field = declaration_field->declaration->definition_new(declaration_field->declaration,
+ _struct->p.scope,
+ declaration_field->name, i, NULL);
+ if (!*field)
+ goto error;
}
return &_struct->p;
+
+error:
+ for (i--; i >= 0; i--) {
+ struct definition *field = g_ptr_array_index(_struct->fields, i);
+ definition_unref(field);
+ }
+ free_definition_scope(_struct->p.scope);
+ declaration_unref(&struct_declaration->p);
+ g_free(_struct);
+ return NULL;
}
static
assert(_struct->fields->len == _struct->declaration->fields->len);
for (i = 0; i < _struct->fields->len; i++) {
- struct field *field = &g_array_index(_struct->fields,
- struct field, i);
- definition_unref(field->definition);
+ struct definition *field = g_ptr_array_index(_struct->fields, i);
+ definition_unref(field);
}
- free_definition_scope(_struct->scope);
+ free_definition_scope(_struct->p.scope);
declaration_unref(_struct->p.declaration);
g_free(_struct);
}
/*
* field returned only valid as long as the field structure is not appended to.
*/
-struct field *
+struct definition *
struct_definition_get_field_from_index(struct definition_struct *_struct,
int index)
{
if (index < 0)
return NULL;
- return &g_array_index(_struct->fields, struct field, index);
+ return g_ptr_array_index(_struct->fields, index);
+}
+
+uint64_t struct_declaration_len(struct declaration_struct *struct_declaration)
+{
+ return struct_declaration->fields->len;
}
projects / babeltrace.git / blobdiff