X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fstruct.c;h=21465c732ba0075af41dce513187bae386a262ee;hp=3bbb8409230ff26afd0653cc40b909d112994f81;hb=d00d17d1e06065eb31a699ce59e16ceb6b858029;hpb=ccd7e1c86f36342b0b06651cc52df86bb663c271 diff --git a/types/struct.c b/types/struct.c index 3bbb8409..21465c73 100644 --- a/types/struct.c +++ b/types/struct.c @@ -3,7 +3,7 @@ * * BabelTrace - Structure Type Converter * - * Copyright 2010 - Mathieu Desnoyers + * Copyright 2010, 2011 - 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 @@ -17,116 +17,201 @@ */ #include -#include +#include + +#ifndef max +#define max(a, b) ((a) < (b) ? (b) : (a)) +#endif + +static +struct definition *_struct_definition_new(struct declaration *declaration, + struct definition_scope *parent_scope, + GQuark field_name, int index); +static +void _struct_definition_free(struct definition *definition); void struct_copy(struct stream_pos *dest, const struct format *fdest, struct stream_pos *src, const struct format *fsrc, - const struct type_class *type_class) + struct definition *definition) { - struct type_class_struct *struct_class = - container_of(type_class, struct type_class_struct, p); - unsigned int i; + struct definition_struct *_struct = + container_of(definition, struct definition_struct, p); + struct declaration_struct *struct_declaration = _struct->declaration; + unsigned long i; - fsrc->struct_begin(src, struct_class); - fdest->struct_begin(dest, struct_class); + fsrc->struct_begin(src, struct_declaration); + fdest->struct_begin(dest, struct_declaration); - for (i = 0; i < struct_class->fields->len; i++) { - struct field *field = &g_array_index(struct_class->fields, + for (i = 0; i < _struct->fields->len; i++) { + struct field *field = &g_array_index(_struct->fields, struct field, i); - struct type_class *field_class = field->type_class; + struct declaration *field_declaration = field->definition->declaration; - field_class->copy(dest, fdest, src, fsrc, &field_class->p); + field_declaration->copy(dest, fdest, src, fsrc, field->definition); } - fsrc->struct_end(src, struct_class); - fdest->struct_end(dest, struct_class); + fsrc->struct_end(src, struct_declaration); + fdest->struct_end(dest, struct_declaration); } -void struct_type_free(struct type_class_struct *struct_class) +static +void _struct_declaration_free(struct declaration *declaration) { - g_hash_table_destroy(struct_class->fields_by_name); - g_array_free(struct_class->fields, true); - g_free(struct_class); + struct declaration_struct *struct_declaration = + container_of(declaration, struct declaration_struct, p); + unsigned long i; + + free_declaration_scope(struct_declaration->scope); + g_hash_table_destroy(struct_declaration->fields_by_name); + + for (i = 0; i < struct_declaration->fields->len; i++) { + struct declaration_field *declaration_field = + &g_array_index(struct_declaration->fields, + struct declaration_field, i); + declaration_unref(declaration_field->declaration); + } + g_array_free(struct_declaration->fields, true); + g_free(struct_declaration); } -static void _struct_type_free(struct type_class *type_class) +struct declaration_struct *struct_declaration_new(const char *name, + struct declaration_scope *parent_scope) { - struct type_class_struct *struct_class = - container_of(type_class, struct type_class_struct, p); - struct_type_free(struct_class); + struct declaration_struct *struct_declaration; + struct declaration *declaration; + + struct_declaration = g_new(struct declaration_struct, 1); + declaration = &struct_declaration->p; + struct_declaration->fields_by_name = g_hash_table_new(g_direct_hash, + g_direct_equal); + struct_declaration->fields = g_array_sized_new(FALSE, TRUE, + sizeof(struct declaration_field), + DEFAULT_NR_STRUCT_FIELDS); + struct_declaration->scope = new_declaration_scope(parent_scope); + declaration->id = CTF_TYPE_STRUCT; + declaration->name = g_quark_from_string(name); + declaration->alignment = 1; + declaration->copy = struct_copy; + declaration->declaration_free = _struct_declaration_free; + declaration->definition_new = _struct_definition_new; + declaration->definition_free = _struct_definition_free; + declaration->ref = 1; + return struct_declaration; } -struct type_class_struct *struct_type_new(const char *name) +static +struct definition * + _struct_definition_new(struct declaration *declaration, + struct definition_scope *parent_scope, + GQuark field_name, int index) { - struct type_class_struct *struct_class; + struct declaration_struct *struct_declaration = + container_of(declaration, struct declaration_struct, p); + struct definition_struct *_struct; + unsigned long i; int ret; - struct_class = g_new(struct type_class_struct, 1); - type_class = &float_class->p; - - struct_class->fields_by_name = g_hash_table_new(g_direct_hash, - g_direct_equal); - struct_class->fields = g_array_sized_new(false, false, - sizeof(struct field), - DEFAULT_NR_STRUCT_FIELDS) - type_class->name = g_quark_from_string(name); - type_class->alignment = 1; - type_class->copy = struct_copy; - type_class->free = _struct_type_free; - - if (type_class->name) { - ret = ctf_register_type(type_class); - if (ret) - goto error_register; + _struct = g_new(struct definition_struct, 1); + declaration_ref(&struct_declaration->p); + _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); + 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); } - return struct_class; + return &_struct->p; +} + +static +void _struct_definition_free(struct definition *definition) +{ + struct definition_struct *_struct = + container_of(definition, struct definition_struct, p); + unsigned long i; -error_register: - g_free(struct_class); - return NULL; + 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); + } + free_definition_scope(_struct->scope); + declaration_unref(_struct->p.declaration); + g_free(_struct); } -void struct_type_add_field(struct type_class_struct *struct_class, +void struct_declaration_add_field(struct declaration_struct *struct_declaration, const char *field_name, - struct type_class *type_class) + struct declaration *field_declaration) { - struct field *field; + struct declaration_field *field; unsigned long index; - g_array_set_size(struct_class->fields, struct_class->fields->len + 1); - index = struct_class->fields->len - 1; /* last field (new) */ - field = &g_array_index(struct_class->fields, struct field, index); + g_array_set_size(struct_declaration->fields, struct_declaration->fields->len + 1); + index = struct_declaration->fields->len - 1; /* last field (new) */ + field = &g_array_index(struct_declaration->fields, struct declaration_field, index); field->name = g_quark_from_string(field_name); - field->type_class = type_class; + declaration_ref(field_declaration); + field->declaration = field_declaration; /* Keep index in hash rather than pointer, because array can relocate */ - g_hash_table_insert(struct_class->fields_by_name, + g_hash_table_insert(struct_declaration->fields_by_name, (gpointer) (unsigned long) field->name, (gpointer) index); /* - * Alignment of structure is the max alignment of types contained + * Alignment of structure is the max alignment of declarations contained * therein. */ - struct_class->p.alignment = max(struct_class->p.alignment, - type_class->alignment); + struct_declaration->p.alignment = max(struct_declaration->p.alignment, + field_declaration->alignment); } unsigned long -struct_type_lookup_field_index(struct type_class_struct *struct_class, - GQuark field_name) + struct_declaration_lookup_field_index(struct declaration_struct *struct_declaration, + GQuark field_name) { unsigned long index; - index = (unsigned long) g_hash_table_lookup(struct_class->fields_by_name, - field_name); + index = (unsigned long) g_hash_table_lookup(struct_declaration->fields_by_name, + (gconstpointer) (unsigned long) field_name); return index; } +/* + * field returned only valid as long as the field structure is not appended to. + */ +struct declaration_field * + struct_declaration_get_field_from_index(struct declaration_struct *struct_declaration, + unsigned long index) +{ + return &g_array_index(struct_declaration->fields, struct declaration_field, index); +} + /* * field returned only valid as long as the field structure is not appended to. */ struct field * -struct_type_get_field_from_index(struct type_class_struct *struct_class, - unsigned long index) +struct_definition_get_field_from_index(struct definition_struct *_struct, + unsigned long index) { - return &g_array_index(struct_class->fields, struct field, index); + return &g_array_index(_struct->fields, struct field, index); }