*
* BabelTrace - Array Type Converter
*
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010, 2011 - 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>
+static
+struct declaration *_array_declaration_new(struct type *type,
+ struct declaration_scope *parent_scope);
+static
+void _array_declaration_free(struct declaration *declaration);
+
void array_copy(struct stream_pos *dest, const struct format *fdest,
struct stream_pos *src, const struct format *fsrc,
- const struct type_class *type_class)
+ struct declaration *declaration)
{
- struct type_class_array *array_class =
- container_of(type_class, struct type_class_array, p);
- unsigned int i;
+ struct declaration_array *array =
+ container_of(declaration, struct declaration_array, p);
+ struct type_array *array_type = array->type;
+ uint64_t i;
- fsrc->array_begin(src, array_class);
- fdest->array_begin(dest, array_class);
+ fsrc->array_begin(src, array_type);
+ fdest->array_begin(dest, array_type);
- for (i = 0; i < array_class->len; i++) {
- struct type_class *elem_class = array_class->elem;
- elem_class->copy(dest, fdest, src, fsrc, elem_class);
+ for (i = 0; i < array_type->len; i++) {
+ struct declaration *elem = array->current_element.declaration;
+ elem->type->copy(dest, fdest, src, fsrc, elem);
}
- fsrc->array_end(src, array_class);
- fdest->array_end(dest, array_class);
+ fsrc->array_end(src, array_type);
+ fdest->array_end(dest, array_type);
}
-void array_type_free(struct type_class_array *array_class)
+static
+void _array_type_free(struct type *type)
{
- type_unref(array_class->elem);
- g_free(array_class);
+ struct type_array *array_type =
+ container_of(type, struct type_array, p);
+
+ free_type_scope(array_type->scope);
+ type_unref(array_type->elem);
+ g_free(array_type);
}
-static void _array_type_free(struct type_class *type_class)
+struct type_array *
+ array_type_new(const char *name, size_t len, struct type *elem_type,
+ struct type_scope *parent_scope)
{
- struct type_class_array *array_class =
- container_of(type_class, struct type_class_array, p);
- array_type_free(array_class);
+ struct type_array *array_type;
+ struct type *type;
+
+ array_type = g_new(struct type_array, 1);
+ type = &array_type->p;
+ array_type->len = len;
+ type_ref(elem_type);
+ array_type->elem = elem_type;
+ array_type->scope = new_type_scope(parent_scope);
+ type->id = CTF_TYPE_ARRAY;
+ type->name = g_quark_from_string(name);
+ /* No need to align the array, the first element will align itself */
+ type->alignment = 1;
+ type->copy = array_copy;
+ type->type_free = _array_type_free;
+ type->declaration_new = _array_declaration_new;
+ type->declaration_free = _array_declaration_free;
+ type->ref = 1;
+ return array_type;
}
-struct type_class_array *array_type_new(const char *name, size_t len,
- struct type_class *elem)
+static
+struct declaration *
+ _array_declaration_new(struct type *type,
+ struct declaration_scope *parent_scope)
{
- struct type_class_array *array_class;
- struct type_class *type_class;
- int ret;
-
- array_class = g_new(struct type_class_array, 1);
- type_class = &array_class->p;
+ struct type_array *array_type =
+ container_of(type, struct type_array, p);
+ struct declaration_array *array;
- array_class->len = len;
- type_ref(elem);
- array_class->elem = elem;
- type_class->name = g_quark_from_string(name);
- /* No need to align the array, the first element will align itself */
- type_class->alignment = 1;
- type_class->copy = array_copy;
- type_class->free = _array_type_free;
- type_class->ref = 1;
+ array = g_new(struct declaration_array, 1);
+ type_ref(&array_type->p);
+ array->p.type = type;
+ array->type = array_type;
+ array->p.ref = 1;
+ array->scope = new_declaration_scope(parent_scope);
+ array->current_element.declaration =
+ array_type->elem->declaration_new(array_type->elem,
+ parent_scope);
+ return &array->p;
+}
- if (type_class->name) {
- ret = ctf_register_type(type_class);
- if (ret)
- goto error_register;
- }
- return array_class;
+static
+void _array_declaration_free(struct declaration *declaration)
+{
+ struct declaration_array *array =
+ container_of(declaration, struct declaration_array, p);
+ struct declaration *elem_declaration =
+ array->current_element.declaration;
-error_register:
- type_unref(array_class->elem);
- g_free(array_class);
- return NULL;
+ elem_declaration->type->declaration_free(elem_declaration);
+ free_declaration_scope(array->scope);
+ type_unref(array->p.type);
+ g_free(array);
}