Work in progress generate io struct

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/formats/ctf/metadata/ctf-ast.h b/formats/ctf/metadata/ctf-ast.h
index 0ce21a5a4b2163e1adf952dd2b0039a10e523766..8a2888dafa28deee9f2a1c229b5a95f474f600d9 100644 (file)
--- a/formats/ctf/metadata/ctf-ast.h
+++ b/formats/ctf/metadata/ctf-ast.h
@@ -206,6 +206,7 @@ struct ctf_node {
                        /* NULL, value or declaration specifier */
                        struct ctf_node *container_type;
                        struct cds_list_head enumerator_list;
                        /* NULL, value or declaration specifier */
                        struct ctf_node *container_type;
                        struct cds_list_head enumerator_list;

+                       int has_body;

                } _enum;
                struct {
                        struct cds_list_head declaration_specifier;
                } _enum;
                struct {
                        struct cds_list_head declaration_specifier;

diff --git a/formats/ctf/metadata/ctf-parser.y b/formats/ctf/metadata/ctf-parser.y
index f6c6185957d52c1a632f751301e5e889091f8171..07d9873838b62bd18459f67488ac86ded9b08838 100644 (file)
--- a/formats/ctf/metadata/ctf-parser.y
+++ b/formats/ctf/metadata/ctf-parser.y
@@ -1542,23 +1542,27 @@ enum_type_specifier:
                LBRAC enumerator_list RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);
                LBRAC enumerator_list RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);

+                       $$->u._enum.has_body = 1;

                        _cds_list_splice_tail(&($2)->tmp_head, &($$)->u._enum.enumerator_list);
                }
        |       LT type_specifier_or_integer_constant GT LBRAC enumerator_list RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);
                        _cds_list_splice_tail(&($2)->tmp_head, &($$)->u._enum.enumerator_list);
                }
        |       LT type_specifier_or_integer_constant GT LBRAC enumerator_list RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);

+                       $$->u._enum.has_body = 1;

                        $$->u._enum.container_type = $2;
                        _cds_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list);
                }
        |       IDENTIFIER LBRAC enumerator_list RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);
                        $$->u._enum.container_type = $2;
                        _cds_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list);
                }
        |       IDENTIFIER LBRAC enumerator_list RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);

+                       $$->u._enum.has_body = 1;

                        $$->u._enum.enum_id = $1->s;
                        _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list);
                }
        |       IDENTIFIER LT type_specifier_or_integer_constant GT LBRAC enumerator_list RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);
                        $$->u._enum.enum_id = $1->s;
                        _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list);
                }
        |       IDENTIFIER LT type_specifier_or_integer_constant GT LBRAC enumerator_list RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);

+                       $$->u._enum.has_body = 1;

                        $$->u._enum.enum_id = $1->s;
                        $$->u._enum.container_type = $3;
                        _cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);
                        $$->u._enum.enum_id = $1->s;
                        $$->u._enum.container_type = $3;
                        _cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);


@@ -1566,12 +1570,14 @@ enum_type_specifier:
        |       ID_TYPE LBRAC enumerator_list RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);
        |       ID_TYPE LBRAC enumerator_list RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);

+                       $$->u._enum.has_body = 1;

                        $$->u._enum.enum_id = $1->s;
                        _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list);
                }
        |       ID_TYPE LT type_specifier_or_integer_constant GT LBRAC enumerator_list RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);
                        $$->u._enum.enum_id = $1->s;
                        _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list);
                }
        |       ID_TYPE LT type_specifier_or_integer_constant GT LBRAC enumerator_list RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);

+                       $$->u._enum.has_body = 1;

                        $$->u._enum.enum_id = $1->s;
                        $$->u._enum.container_type = $3;
                        _cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);
                        $$->u._enum.enum_id = $1->s;
                        $$->u._enum.container_type = $3;
                        _cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);


@@ -1579,23 +1585,27 @@ enum_type_specifier:
        |       LBRAC enumerator_list COMMA RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);
        |       LBRAC enumerator_list COMMA RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);

+                       $$->u._enum.has_body = 1;

                        _cds_list_splice_tail(&($2)->tmp_head, &($$)->u._enum.enumerator_list);
                }
        |       LT type_specifier_or_integer_constant GT LBRAC enumerator_list COMMA RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);
                        _cds_list_splice_tail(&($2)->tmp_head, &($$)->u._enum.enumerator_list);
                }
        |       LT type_specifier_or_integer_constant GT LBRAC enumerator_list COMMA RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);

+                       $$->u._enum.has_body = 1;

                        $$->u._enum.container_type = $2;
                        _cds_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list);
                }
        |       IDENTIFIER LBRAC enumerator_list COMMA RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);
                        $$->u._enum.container_type = $2;
                        _cds_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list);
                }
        |       IDENTIFIER LBRAC enumerator_list COMMA RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);

+                       $$->u._enum.has_body = 1;

                        $$->u._enum.enum_id = $1->s;
                        _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list);
                }
        |       IDENTIFIER LT type_specifier_or_integer_constant GT LBRAC enumerator_list COMMA RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);
                        $$->u._enum.enum_id = $1->s;
                        _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list);
                }
        |       IDENTIFIER LT type_specifier_or_integer_constant GT LBRAC enumerator_list COMMA RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);

+                       $$->u._enum.has_body = 1;

                        $$->u._enum.enum_id = $1->s;
                        $$->u._enum.container_type = $3;
                        _cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);
                        $$->u._enum.enum_id = $1->s;
                        $$->u._enum.container_type = $3;
                        _cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);


@@ -1603,23 +1613,27 @@ enum_type_specifier:
        |       IDENTIFIER
                {
                        $$ = make_node(scanner, NODE_ENUM);
        |       IDENTIFIER
                {
                        $$ = make_node(scanner, NODE_ENUM);

+                       $$->u._enum.has_body = 0;

                        $$->u._enum.enum_id = $1->s;
                }
        |       IDENTIFIER LT type_specifier_or_integer_constant GT
                {
                        $$ = make_node(scanner, NODE_ENUM);
                        $$->u._enum.enum_id = $1->s;
                }
        |       IDENTIFIER LT type_specifier_or_integer_constant GT
                {
                        $$ = make_node(scanner, NODE_ENUM);

+                       $$->u._enum.has_body = 0;

                        $$->u._enum.enum_id = $1->s;
                        $$->u._enum.container_type = $3;
                }
        |       ID_TYPE LBRAC enumerator_list COMMA RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);
                        $$->u._enum.enum_id = $1->s;
                        $$->u._enum.container_type = $3;
                }
        |       ID_TYPE LBRAC enumerator_list COMMA RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);

+                       $$->u._enum.has_body = 1;

                        $$->u._enum.enum_id = $1->s;
                        _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list);
                }
        |       ID_TYPE LT type_specifier_or_integer_constant GT LBRAC enumerator_list COMMA RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);
                        $$->u._enum.enum_id = $1->s;
                        _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list);
                }
        |       ID_TYPE LT type_specifier_or_integer_constant GT LBRAC enumerator_list COMMA RBRAC
                {
                        $$ = make_node(scanner, NODE_ENUM);

+                       $$->u._enum.has_body = 1;

                        $$->u._enum.enum_id = $1->s;
                        $$->u._enum.container_type = $3;
                        _cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);
                        $$->u._enum.enum_id = $1->s;
                        $$->u._enum.container_type = $3;
                        _cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);


@@ -1627,11 +1641,13 @@ enum_type_specifier:
        |       ID_TYPE
                {
                        $$ = make_node(scanner, NODE_ENUM);
        |       ID_TYPE
                {
                        $$ = make_node(scanner, NODE_ENUM);

+                       $$->u._enum.has_body = 0;

                        $$->u._enum.enum_id = $1->s;
                }
        |       ID_TYPE LT type_specifier_or_integer_constant GT
                {
                        $$ = make_node(scanner, NODE_ENUM);
                        $$->u._enum.enum_id = $1->s;
                }
        |       ID_TYPE LT type_specifier_or_integer_constant GT
                {
                        $$ = make_node(scanner, NODE_ENUM);

+                       $$->u._enum.has_body = 0;

                        $$->u._enum.enum_id = $1->s;
                        $$->u._enum.container_type = $3;
                }
                        $$->u._enum.enum_id = $1->s;
                        $$->u._enum.container_type = $3;
                }

diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
index 7e2dc07268d4a7917c3b78b226d4846a560c70b9..fd6176fef4a1bef223cb3c0f3df0d34621d73d02 100644 (file)
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -23,6 +23,7 @@
 #include <assert.h>
 #include <glib.h>
 #include <inttypes.h>
 #include <assert.h>
 #include <glib.h>
 #include <inttypes.h>

+#include <endian.h>

 #include <errno.h>
 #include <babeltrace/list.h>
 #include <uuid/uuid.h>
 #include <errno.h>
 #include <babeltrace/list.h>
 #include <uuid/uuid.h>


@@ -37,157 +38,14 @@
 
 static
 struct declaration *ctf_declaration_specifier_visit(FILE *fd,
 
 static
 struct declaration *ctf_declaration_specifier_visit(FILE *fd,

-               int depth, struct list_head *head,
+               int depth, struct cds_list_head *head,

                struct declaration_scope *declaration_scope);
 
                struct declaration_scope *declaration_scope);
 

-static
-int ctf_visitor_print_type_specifier(FILE *fd, int depth, struct ctf_node *node)
-{
-       print_tabs(fd, depth);
-       fprintf(fd, "<type_specifier \"");
-
-       switch (node->u.type_specifier.type) {
-       case TYPESPEC_VOID:
-               fprintf(fd, "void");
-               break;
-       case TYPESPEC_CHAR:
-               fprintf(fd, "char");
-               break;
-       case TYPESPEC_SHORT:
-               fprintf(fd, "short");
-               break;
-       case TYPESPEC_INT:
-               fprintf(fd, "int");
-               break;
-       case TYPESPEC_LONG:
-               fprintf(fd, "long");
-               break;
-       case TYPESPEC_FLOAT:
-               fprintf(fd, "float");
-               break;
-       case TYPESPEC_DOUBLE:
-               fprintf(fd, "double");
-               break;
-       case TYPESPEC_SIGNED:
-               fprintf(fd, "signed");
-               break;
-       case TYPESPEC_UNSIGNED:
-               fprintf(fd, "unsigned");
-               break;
-       case TYPESPEC_BOOL:
-               fprintf(fd, "bool");
-               break;
-       case TYPESPEC_COMPLEX:
-               fprintf(fd, "_Complex");
-               break;
-       case TYPESPEC_IMAGINARY:
-               fprintf(fd, "_Imaginary");
-               break;
-       case TYPESPEC_CONST:
-               fprintf(fd, "const");
-               break;
-       case TYPESPEC_ID_TYPE:
-               fprintf(fd, "%s", node->u.type_specifier.id_type);
-               break;
-
-       case TYPESPEC_UNKNOWN:
-       default:
-               fprintf(stderr, "[error] %s: unknown type specifier %d\n", __func__,
-                       (int) node->u.type_specifier.type);
-               return -EINVAL;
-       }
-       fprintf(fd, "\"/>\n");
-       return 0;
-}
-
-static
-int ctf_visitor_print_type_declarator(FILE *fd, int depth, struct ctf_node *node)
-{
-       int ret = 0;
-       struct ctf_node *iter;
-
-       print_tabs(fd, depth);
-       fprintf(fd, "<type_declarator>\n");
-       depth++;
-
-       if (!cds_list_empty(&node->u.type_declarator.pointers)) {
-               print_tabs(fd, depth);
-               fprintf(fd, "<pointers>\n");
-               cds_list_for_each_entry(iter, &node->u.type_declarator.pointers,
-                                       siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</pointers>\n");
-       }
-
-       switch (node->u.type_declarator.type) {
-       case TYPEDEC_ID:
-               if (node->u.type_declarator.u.id) {
-                       print_tabs(fd, depth);
-                       fprintf(fd, "<id \"");
-                       fprintf(fd, "%s", node->u.type_declarator.u.id);
-                       fprintf(fd, "\" />\n");
-               }
-               break;
-       case TYPEDEC_NESTED:
-               if (node->u.type_declarator.u.nested.type_declarator) {
-                       print_tabs(fd, depth);
-                       fprintf(fd, "<type_declarator>\n");
-                       ret = ctf_visitor_print_xml(fd, depth + 1,
-                               node->u.type_declarator.u.nested.type_declarator);
-                       if (ret)
-                               return ret;
-                       print_tabs(fd, depth);
-                       fprintf(fd, "</type_declarator>\n");
-               }
-               if (node->u.type_declarator.u.nested.length) {
-                       print_tabs(fd, depth);
-                       fprintf(fd, "<length>\n");
-                       ret = ctf_visitor_print_xml(fd, depth + 1,
-                               node->u.type_declarator.u.nested.length);
-                       if (ret)
-                               return ret;
-                       print_tabs(fd, depth);
-                       fprintf(fd, "</length>\n");
-               }
-               if (node->u.type_declarator.u.nested.abstract_array) {
-                       print_tabs(fd, depth);
-                       fprintf(fd, "<length>\n");
-                       print_tabs(fd, depth);
-                       fprintf(fd, "</length>\n");
-               }
-               if (node->u.type_declarator.bitfield_len) {
-                       print_tabs(fd, depth);
-                       fprintf(fd, "<bitfield_len>\n");
-                       ret = ctf_visitor_print_xml(fd, depth + 1,
-                               node->u.type_declarator.bitfield_len);
-                       if (ret)
-                               return ret;
-                       print_tabs(fd, depth);
-                       fprintf(fd, "</bitfield_len>\n");
-               }
-               break;
-       case TYPEDEC_UNKNOWN:
-       default:
-               fprintf(stderr, "[error] %s: unknown type declarator %d\n", __func__,
-                       (int) node->u.type_declarator.type);
-               return -EINVAL;
-       }
-
-       depth--;
-       print_tabs(fd, depth);
-       fprintf(fd, "</type_declarator>\n");
-       return 0;
-}
-

 /*
  * String returned must be freed by the caller using g_free.
  */
 static
 /*
  * String returned must be freed by the caller using g_free.
  */
 static

-char *concatenate_unary_strings(struct list_head *head)
+char *concatenate_unary_strings(struct cds_list_head *head)

 {
        struct ctf_node *node;
        GString *str;
 {
        struct ctf_node *node;
        GString *str;


@@ -220,7 +78,7 @@ char *concatenate_unary_strings(struct list_head *head)
 }
 
 static
 }
 
 static

-int get_unary_unsigned(struct list_head *head, uint64_t *value)
+int get_unary_unsigned(struct cds_list_head *head, uint64_t *value)

 {
        struct ctf_node *node;
        int i = 0;
 {
        struct ctf_node *node;
        int i = 0;


@@ -237,7 +95,7 @@ int get_unary_unsigned(struct list_head *head, uint64_t *value)
 }
 
 static
 }
 
 static

-int get_unary_uuid(struct list_head *head, uuid_t *uuid)
+int get_unary_uuid(struct cds_list_head *head, uuid_t *uuid)

 {
        struct ctf_node *node;
        int i = 0;
 {
        struct ctf_node *node;
        int i = 0;


@@ -264,12 +122,141 @@ struct ctf_stream *trace_stream_lookup(struct ctf_trace *trace, uint64_t stream_
        return g_ptr_array_index(trace->streams, stream_id);
 }
 
        return g_ptr_array_index(trace->streams, stream_id);
 }
 

+static
+void visit_declaration_specifier(struct cds_list_head *declaration_specifier, GString *str)
+{
+       struct ctf_node *iter;
+       int alias_item_nr = 0;
+       int err;
+
+       cds_list_for_each_entry(iter, declaration_specifier, siblings) {
+               if (alias_item_nr != 0)
+                       g_string_append(str, " ");
+               alias_item_nr++;
+
+               switch (iter->type) {
+               case NODE_TYPE_SPECIFIER:
+                       switch (iter->u.type_specifier.type) {
+                       case TYPESPEC_VOID:
+                               g_string_append(str, "void");
+                               break;
+                       case TYPESPEC_CHAR:
+                               g_string_append(str, "char");
+                               break;
+                       case TYPESPEC_SHORT:
+                               g_string_append(str, "short");
+                               break;
+                       case TYPESPEC_INT:
+                               g_string_append(str, "int");
+                               break;
+                       case TYPESPEC_LONG:
+                               g_string_append(str, "long");
+                               break;
+                       case TYPESPEC_FLOAT:
+                               g_string_append(str, "float");
+                               break;
+                       case TYPESPEC_DOUBLE:
+                               g_string_append(str, "double");
+                               break;
+                       case TYPESPEC_SIGNED:
+                               g_string_append(str, "signed");
+                               break;
+                       case TYPESPEC_UNSIGNED:
+                               g_string_append(str, "unsigned");
+                               break;
+                       case TYPESPEC_BOOL:
+                               g_string_append(str, "bool");
+                               break;
+                       case TYPESPEC_COMPLEX:
+                               g_string_append(str, "_Complex");
+                               break;
+                       case TYPESPEC_IMAGINARY:
+                               g_string_append(str, "_Imaginary");
+                               break;
+                       case TYPESPEC_CONST:
+                               g_string_append(str, "const");
+                               break;
+                       case TYPESPEC_ID_TYPE:
+                               if (iter->u.type_specifier.id_type)
+                                       g_string_append(str, iter->u.type_specifier.id_type);
+                               break;
+                       default:
+                               fprintf(stderr, "[error] %s: unknown specifier\n", __func__);
+                               err = -EINVAL;
+                               goto error;
+                       }
+                       break;
+               case NODE_ENUM:
+                       if (!iter->u._enum.enum_id) {
+                               fprintf(stderr, "[error] %s: unexpected empty enum ID\n", __func__);
+                               err = -EINVAL;
+                               goto error;
+                       }
+                       g_string_append(str, "enum ");
+                       g_string_append(str, iter->u._enum.enum_id);
+                       break;
+               case NODE_VARIANT:
+                       if (!iter->u.variant.name) {
+                               fprintf(stderr, "[error] %s: unexpected empty variant name\n", __func__);
+                               err = -EINVAL;
+                               goto error;
+                       }
+                       g_string_append(str, "variant ");
+                       g_string_append(str, iter->u.variant.name);
+                       break;
+               case NODE_STRUCT:
+                       if (!iter->u._struct.name) {
+                               fprintf(stderr, "[error] %s: unexpected empty variant name\n", __func__);
+                               err = -EINVAL;
+                               goto error;
+                       }
+                       g_string_append(str, "struct ");
+                       g_string_append(str, iter->u._struct.name);
+                       break;
+               default:
+                       fprintf(stderr, "[error] %s: unexpected node type %d\n", __func__, (int) iter->type);
+                       err = -EINVAL;
+                       goto error;
+               }
+       }
+       return 0;
+error:
+       return err;
+}
+
+static
+GQuark create_typealias_identifier(int fd, int depth,
+       struct cds_list_head *declaration_specifier,
+       struct ctf_node *node_type_declarator)
+{
+       GString *str;
+       const char *str_c;
+       GQuark alias_q;
+       int ret;
+
+       str = g_string_new();
+       ret = visit_declaration_specifier(declaration_specifier, str);
+       if (ret) {
+               g_string_free(str, TRUE);
+               return 0;
+       }
+       cds_list_for_each_entry(iter, &node_type_declarator->u.type_declarator.pointers, siblings) {
+               g_string_append(str, " *");
+               if (iter->u.pointer.const_qualifier)
+                       g_string_append(str, " const");
+       }
+       str_c = g_string_free(str, FALSE);
+       alias_q = g_quark_from_string(str_c);
+       g_free(str_c);
+       return alias_q;
+}
+

 static
 struct declaration *ctf_type_declarator_visit(int fd, int depth,
        struct cds_list_head *declaration_specifier,
        GQuark *field_name,
        struct ctf_node *node_type_declarator,
 static
 struct declaration *ctf_type_declarator_visit(int fd, int depth,
        struct cds_list_head *declaration_specifier,
        GQuark *field_name,
        struct ctf_node *node_type_declarator,

-       struct declaration_scope *declaration_scope
+       struct declaration_scope *declaration_scope,

        struct declaration *nested_declaration)
 {
        /*
        struct declaration *nested_declaration)
 {
        /*


@@ -279,20 +266,31 @@ struct declaration *ctf_type_declarator_visit(int fd, int depth,
         */
 
        assert(node_type_declarator->u.type_declarator.type != TYPEDEC_UNKNOWN);
         */
 
        assert(node_type_declarator->u.type_declarator.type != TYPEDEC_UNKNOWN);

+

        /* TODO: gcc bitfields not supported yet. */
        /* TODO: gcc bitfields not supported yet. */

-       assert(node_type_declarator->u.type_declarator.bitfield_len == NULL);
+       if (node_type_declarator->u.type_declarator.bitfield_len != NULL) {
+               fprintf(stderr, "[error] %s: gcc bitfields are not supported yet.\n", __func__);
+               return NULL;
+       }

 
        if (!nested_declaration) {
                if (!cds_list_empty(&node_type_declarator->u.type_declarator.pointers)) {
 
        if (!nested_declaration) {
                if (!cds_list_empty(&node_type_declarator->u.type_declarator.pointers)) {

+                       GQuark alias_q;
+

                        /*
                         * If we have a pointer declarator, it _has_ to be present in
                         * the typealiases (else fail).
                         */
                        /*
                         * If we have a pointer declarator, it _has_ to be present in
                         * the typealiases (else fail).
                         */

-                       nested_declaration = ... ;
+                       alias_q = create_typealias_identifier(fd, depth,
+                               declaration_specifier, node_type_declarator);
+                       nested_declaration = lookup_declaration(alias_q, declaration_scope);
+                       if (!nested_declaration) {
+                               fprintf(stderr, "[error] %s: cannot find typealias \"%s\".\n", __func__, g_quark_to_string(alias_q));
+                               return NULL;
+                       }

                } else {
                        nested_declaration = /* parse declaration_specifier */;
                }
                } else {
                        nested_declaration = /* parse declaration_specifier */;
                }

-

        }
 
        if (node_type_declarator->u.type_declarator.type == TYPEDEC_ID) {
        }
 
        if (node_type_declarator->u.type_declarator.type == TYPEDEC_ID) {


@@ -313,6 +311,8 @@ struct declaration *ctf_type_declarator_visit(int fd, int depth,
                        switch (length->type) {
                        case NODE_UNARY_EXPRESSION:
                                /* Array */
                        switch (length->type) {
                        case NODE_UNARY_EXPRESSION:
                                /* Array */

+                               /* TODO */
+               .............

                                declaration = /* create array */;
                                break;
                        case NODE_TYPE_SPECIFIER:
                                declaration = /* create array */;
                                break;
                        case NODE_TYPE_SPECIFIER:


@@ -355,7 +355,31 @@ int ctf_struct_type_declarators_visit(int fd, int depth,
                                             g_quark_to_string(field_name),
                                             field_declaration);
        }
                                             g_quark_to_string(field_name),
                                             field_declaration);
        }

+       return 0;
+}

 
 

+static
+int ctf_variant_type_declarators_visit(int fd, int depth,
+       struct declaration_variant *variant_declaration,
+       struct cds_list_head *declaration_specifier,
+       struct cds_list_head *type_declarators,
+       struct declaration_scope *declaration_scope)
+{
+       struct ctf_node *iter;
+       GQuark field_name;
+
+       cds_list_for_each_entry(iter, type_declarators, siblings) {
+               struct declaration *field_declaration;
+
+               field_declaration = ctf_type_declarator_visit(fd, depth,
+                                               declaration_specifier,
+                                               &field_name, iter,
+                                               variant_declaration->scope,
+                                               NULL);
+               variant_declaration_add_field(variant_declaration,
+                                             g_quark_to_string(field_name),
+                                             field_declaration);
+       }

        return 0;
 }
 
        return 0;
 }
 


@@ -390,11 +414,8 @@ int ctf_typealias_visit(int fd, int depth, struct declaration_scope *scope,
 {
        struct declaration *type_declaration;
        struct ctf_node *iter, *node;
 {
        struct declaration *type_declaration;
        struct ctf_node *iter, *node;

-       GQuark identifier, dummy_id;
-       GString *str;
-       const char *str_c;
+       GQuark dummy_id;

        GQuark alias_q;
        GQuark alias_q;

-       int alias_item_nr = 0;

 
        /* See ctf_visitor_type_declarator() in the semantic validator. */
 
 
        /* See ctf_visitor_type_declarator() in the semantic validator. */
 


@@ -423,114 +444,11 @@ int ctf_typealias_visit(int fd, int depth, struct declaration_scope *scope,
        /*
         * Create alias identifier.
         */
        /*
         * Create alias identifier.
         */

-       str = g_string_new();
-       cds_list_for_each_entry(iter, &alias->u.typealias_alias.declaration_specifier, siblings) {
-               if (alias_item_nr != 0)
-                       g_string_append(str, " ");
-               alias_item_nr++;
-
-               switch (iter->type) {
-               case NODE_TYPE_SPECIFIER:
-                       switch (iter->u.type_specifier.type) {
-                       case TYPESPEC_VOID:
-                               g_string_append(str, "void");
-                               break;
-                       case TYPESPEC_CHAR:
-                               g_string_append(str, "char");
-                               break;
-                       case TYPESPEC_SHORT:
-                               g_string_append(str, "short");
-                               break;
-                       case TYPESPEC_INT:
-                               g_string_append(str, "int");
-                               break;
-                       case TYPESPEC_LONG:
-                               g_string_append(str, "long");
-                               break;
-                       case TYPESPEC_FLOAT:
-                               g_string_append(str, "float");
-                               break;
-                       case TYPESPEC_DOUBLE:
-                               g_string_append(str, "double");
-                               break;
-                       case TYPESPEC_SIGNED:
-                               g_string_append(str, "signed");
-                               break;
-                       case TYPESPEC_UNSIGNED:
-                               g_string_append(str, "unsigned");
-                               break;
-                       case TYPESPEC_BOOL:
-                               g_string_append(str, "bool");
-                               break;
-                       case TYPESPEC_COMPLEX:
-                               g_string_append(str, "_Complex");
-                               break;
-                       case TYPESPEC_IMAGINARY:
-                               g_string_append(str, "_Imaginary");
-                               break;
-                       case TYPESPEC_CONST:
-                               g_string_append(str, "const");
-                               break;
-                       case TYPESPEC_ID_TYPE:
-                               if (!iter->u.type_specifier.id_type) {
-                                       fprintf(stderr, "[error] %s: unexpected empty ID\n", __func__);
-                                       err = -EINVAL;
-                                       goto error;
-                               }
-                               g_string_append(str, iter->u.type_specifier.id_type);
-                               break;
-                       default:
-                               fprintf(stderr, "[error] %s: unknown specifier\n", __func__);
-                               err = -EINVAL;
-                               goto error;
-                       }
-                       break;
-               case NODE_ENUM:
-                       if (!iter->u._enum.enum_id) {
-                               fprintf(stderr, "[error] %s: unexpected empty enum ID\n", __func__);
-                               err = -EINVAL;
-                               goto error;
-                       }
-                       g_string_append(str, "enum ");
-                       g_string_append(str, iter->u._enum.enum_id);
-                       break;
-               case NODE_VARIANT:
-                       if (!iter->u.variant.name) {
-                               fprintf(stderr, "[error] %s: unexpected empty variant name\n", __func__);
-                               err = -EINVAL;
-                               goto error;
-                       }
-                       g_string_append(str, "variant ");
-                       g_string_append(str, iter->u.variant.name);
-                       break;
-               case NODE_STRUCT:
-                       if (!iter->u._struct.name) {
-                               fprintf(stderr, "[error] %s: unexpected empty variant name\n", __func__);
-                               err = -EINVAL;
-                               goto error;
-                       }
-                       g_string_append(str, "struct ");
-                       g_string_append(str, iter->u._struct.name);
-                       break;
-               default:
-                       fprintf(stderr, "[error] %s: unexpected node type %d\n", __func__, (int) iter->type);
-                       err = -EINVAL;
-                       goto error;
-               }
-       }

 
        node = _cds_list_first_entry(&alias->u.typealias_alias.type_declarators,
 
        node = _cds_list_first_entry(&alias->u.typealias_alias.type_declarators,

-                               struct node, siblings) {
-               cds_list_for_each_entry(iter, &node->u.type_declarator.pointers, siblings) {
-                       g_string_append(str, " *");
-                       if (iter->u.pointer.const_qualifier)
-                               g_string_append(str, " const");
-               }
-
-       }
-       str_c = g_string_free(str, FALSE);
-       alias_q = g_quark_from_string(str_c);
-       g_free(str_c);
+                               struct node, siblings);
+       alias_q = create_typealias_identifier(fd, depth,
+                       &alias->u.typealias_alias.declaration_specifier, node);

        ret = register_declaration(alias_q, type_declaration, scope);
        if (ret)
                goto error;
        ret = register_declaration(alias_q, type_declaration, scope);
        if (ret)
                goto error;


@@ -583,6 +501,48 @@ int ctf_struct_declaration_list_visit(int fd, int depth,
        return 0;
 }
 
        return 0;
 }
 

+static
+int ctf_variant_declaration_list_visit(int fd, int depth,
+       struct ctf_node *iter, struct declaration_variant *variant_declaration)
+{
+       struct declaration *declaration;
+       int ret;
+
+       switch (iter->type) {
+       case NODE_TYPEDEF:
+               /* For each declarator, declare type and add type to variant declaration scope */
+               ret = ctf_typedef_visit(fd, depth,
+                       variant_declaration->scope,
+                       &iter->u._typedef.declaration_specifier,
+                       &iter->u._typedef.type_declarators);
+               if (ret)
+                       return ret;
+               break;
+       case NODE_TYPEALIAS:
+               /* Declare type with declarator and add type to variant declaration scope */
+               ret = ctf_typealias_visit(fd, depth,
+                       variant_declaration->scope,
+                       iter->u.typealias.target,
+                       iter->u.typealias.alias);
+               if (ret)
+                       return ret;
+               break;
+       case NODE_STRUCT_OR_VARIANT_DECLARATION:
+               /* Add field to structure declaration */
+               ret = ctf_variant_type_declarators_visit(fd, depth,
+                               variant_declaration,
+                               &iter->u.struct_or_variant_declaration.declaration_specifier,
+                               &iter->u.struct_or_variant_declaration.type_declarators);
+               if (ret)
+                       return ret;
+               break;
+       default:
+               fprintf(stderr, "[error] %s: unexpected node type %d\n", __func__, (int) iter->type);
+               assert(0);
+       }
+       return 0;
+}
+

 static
 struct declaration_struct *ctf_declaration_struct_visit(FILE *fd,
        int depth, const char *name, struct cds_list_head *declaration_list,
 static
 struct declaration_struct *ctf_declaration_struct_visit(FILE *fd,
        int depth, const char *name, struct cds_list_head *declaration_list,


@@ -610,14 +570,13 @@ struct declaration_struct *ctf_declaration_struct_visit(FILE *fd,
                        if (lookup_struct_declaration(g_quark_from_string(name),
                                                      declaration_scope)) {
                                
                        if (lookup_struct_declaration(g_quark_from_string(name),
                                                      declaration_scope)) {
                                

-                               fprintf(stderr, "[error] %s: struct %s already declared in scope\n", name);
+                               fprintf(stderr, "[error] %s: struct %s already declared in scope\n", __func__, name);

                                return NULL;
                        }
                }
                struct_declaration = struct_declaration_new(name, declaration_scope);
                cds_list_for_each_entry(iter, declaration_list, siblings) {
                                return NULL;
                        }
                }
                struct_declaration = struct_declaration_new(name, declaration_scope);
                cds_list_for_each_entry(iter, declaration_list, siblings) {

-                       ret = ctf_struct_declaration_list_visit(fd,
-depth + 1, iter, struct_declaration);
+                       ret = ctf_struct_declaration_list_visit(fd, depth + 1, iter, struct_declaration);

                        if (ret)
                                goto error;
                }
                        if (ret)
                                goto error;
                }


@@ -634,120 +593,232 @@ error:
        return NULL;
 }
 
        return NULL;
 }
 

-/*
- * Also add named variant, struct or enum to the current declaration scope.
- */

 static
 static

-struct declaration *ctf_declaration_specifier_visit(FILE *fd,
-               int depth, struct list_head *head,
-               struct declaration_scope *declaration_scope)
+struct declaration_variant *ctf_declaration_variant_visit(FILE *fd,
+       int depth, const char *name, struct cds_list_head *declaration_list,
+       int has_body, struct declaration_scope *declaration_scope)

 {
        struct declaration *declaration;
 {
        struct declaration *declaration;

-       struct node *first;
-
-       first = _cds_list_first_entry(head, struct node, siblings);
+       struct declaration_variant *variant_declaration;
+       struct ctf_node *iter;

 
 

-       switch (first->type) {
-       case NODE_STRUCT:
-               return ctf_declaration_struct_visit(fd, depth,
-                       first->u._struct.name,
-                       &first->u._struct.declaration_list,
-                       first->u._struct.has_body,
-                       declaration_scope);
-               break;
-       case NODE_VARIANT:
-               /*
-                * For named variant (without body), lookup in
-                * declaration scope and create declaration copy.
-                */
-               /* For named variant (with body), create type and add to declaration scope */
+       /*
+        * For named variant (without body), lookup in
+        * declaration scope. Don't take reference on variant
+        * declaration: ref is only taken upon definition.
+        */
+       if (!has_body) {
+               assert(name);
+               variant_declaration =
+                       lookup_variant_declaration(g_quark_from_string(name),
+                                                  declaration_scope);
+               return variant_declaration;
+       } else {

                /* For unnamed variant, create type */
                /* For unnamed variant, create type */

-               /* If variant has a tag field specifier, assign tag name. */
-               break;
-       case NODE_ENUM:
-               /*
-                * For named enum (without body), lookup in declaration
-                * scope and create declaration copy.
-                */
-               /* For named enum (with body), create type and add to declaration scope */
-               /* For unnamed enum, create type */
-               /* Enumerations need to have their size/type specifier (< >). */
-               break;
-       case NODE_INTEGER:
-               /*
-                * Create an integer declaration.
-                */
-               break;
-       case NODE_FLOATING_POINT:
-               /*
-                * Create a floating point declaration.
-                */
-               break;
-       case NODE_STRING:
-               /*
-                * Create a string declaration.
-                */
-               break;
-       case NODE_TYPE_SPECIFIER:
-               /*
-                * Lookup named type in typedef declarations (in
-                * declaration scope). Create a copy of the declaration.
-                */
-               break;
-
+               /* For named variant (with body), create type and add to declaration scope */
+               if (name) {
+                       if (lookup_variant_declaration(g_quark_from_string(name),
+                                                      declaration_scope)) {
+                               
+                               fprintf(stderr, "[error] %s: variant %s already declared in scope\n", __func__, name);
+                               return NULL;
+                       }
+               }
+               variant_declaration = variant_declaration_new(name, declaration_scope);
+               cds_list_for_each_entry(iter, declaration_list, siblings) {
+                       ret = ctf_variant_declaration_list_visit(fd, depth + 1, iter, variant_declaration);
+                       if (ret)
+                               goto error;
+               }
+               if (name) {
+                       ret = register_variant_declaration(g_quark_from_string(name),
+                                       variant_declaration,
+                                       declaration_scope);
+                       assert(!ret);
+               }
+               return variant_declaration;

        }
        }

+error:
+       variant_declaration->p.declaration_free(&variant_declaration->p);
+       return NULL;

 }
 
 static
 }
 
 static

-int ctf_typedef_declarator_visit(FILE *fd, int depth,
-               struct list_head *declaration_specifier,
-               struct node *type_declarator,
-               struct declaration_scope *declaration_scope)
+int ctf_enumerator_list_visit(int fd, int depth,
+               struct ctf_node *enumerator,
+               struct declaration_enum *enum_declaration)
+{
+       /* TODO */
+........
+       return 0;
+}
+
+static
+struct declaration *ctf_declaration_enum_visit(int fd, int depth,
+                       const char *name,
+                       struct ctf_node *container_type,
+                       struct cds_list_head *enumerator_list,
+                       int has_body)

 {
 {

+       struct declaration *declaration;
+       struct declaration_enum *enum_declaration;
+       struct declaration_integer *integer_declaration;
+       struct ctf_node *iter;
+

        /*
        /*

-        * Build the type using declaration specifier (creating
-        * declaration from type_specifier), then apply type declarator,
-        * add the resulting type to the current declaration scope.
+        * For named enum (without body), lookup in
+        * declaration scope. Don't take reference on enum
+        * declaration: ref is only taken upon definition.

         */
         */

-       cds_list_for_each_entry(iter, declaration_specifier, siblings) {
-
+       if (!has_body) {
+               assert(name);
+               enum_declaration =
+                       lookup_enum_declaration(g_quark_from_string(name),
+                                               declaration_scope);
+               return enum_declaration;
+       } else {
+               /* For unnamed enum, create type */
+               /* For named enum (with body), create type and add to declaration scope */
+               if (name) {
+                       if (lookup_enum_declaration(g_quark_from_string(name),
+                                                   declaration_scope)) {
+                               
+                               fprintf(stderr, "[error] %s: enum %s already declared in scope\n", __func__, name);
+                               return NULL;
+                       }
+               }

 
 

+               /* TODO CHECK Enumerations need to have their size/type specifier (< >). */
+               integer_declaration = integer_declaration_new(); /* TODO ... */
+               .....
+               enum_declaration = enum_declaration_new(name, integer_declaration);
+               declaration_unref(&integer_declaration->p);     /* leave ref to enum */
+               cds_list_for_each_entry(iter, enumerator_list, siblings) {
+                       ret = ctf_enumerator_list_visit(fd, depth + 1, iter, enum_declaration);
+                       if (ret)
+                               goto error;
+               }
+               if (name) {
+                       ret = register_enum_declaration(g_quark_from_string(name),
+                                       enum_declaration,
+                                       declaration_scope);
+                       assert(!ret);
+               }
+               return enum_declaration;

        }
        }

-       return 0;
+error:
+       enum_declaration->p.declaration_free(&enum_declaration->p);
+       return NULL;

 }
 
 static
 }
 
 static

-int ctf_typedef_visit(FILE *fd, int depth,
-               struct list_head *declaration_specifier,
-               struct list_head *type_declarators,
+struct declaration *ctf_declaration_type_specifier_visit(int fd, int depth,
+               struct cds_list_head *declaration_specifier,

                struct declaration_scope *declaration_scope)
 {
                struct declaration_scope *declaration_scope)
 {

-       struct ctf_node *iter;
+       GString *str;
+       struct declaration *declaration;
+       const char *str_c;

 
 

-       cds_list_for_each_entry(iter, type_declarators, siblings) {
-               ret = ctf_typedef_declarator_visit(fd, depth + 1,
-                       &node->u._typedef.declaration_specifier, iter,
-                       declaration_scope);
-               if (ret)
-                       return ret;
+       str = g_string_new();
+       ret = visit_declaration_specifier(declaration_specifier, str);
+       if (ret)
+               return NULL;
+       str_c = g_string_free(str, FALSE);
+       id_q = g_quark_from_string(str_c);
+       g_free(str_c);
+       declaration = lookup_declaration(id_q, declaration_scope);
+       return declaration;
+}
+
+static
+struct declaration *ctf_declaration_integer_visit(int fd, int depth,
+               struct cds_list_head *expressions)
+{
+       struct node *expression;
+       uint64_t alignment, size, byte_order = trace->native_bo, signedness = 0;
+       int has_alignment = 0, has_size = 0;
+       struct declaration_integer *integer_declaration;
+
+       cds_list_for_each_entry(expression, expressions, siblings) {
+               struct node *left, *right;
+
+               left = expression->u.ctf_expression.left;
+               right = expression->u.ctf_expression.right;
+               assert(left->u.unary_expression.type == UNARY_STRING);
+               if (!strcmp(left->u.unary_expression.u.string, "signed")) {
+                       /* TODO */
+       ...........
+               } else if (!strcmp(left->u.unary_expression.u.string, "byte_order")) {
+
+               } else if (!strcmp(left->u.unary_expression.u.string, "size")) {
+                       has_size = 1;
+               } else if (!strcmp(left->u.unary_expression.u.string, "align")) {
+                       has_alignment = 1;
+               } else {
+                       fprintf(stderr, "[error] %s: unknown attribute name %s\n",
+                               __func__, left->u.unary_expression.u.string);
+                       return NULL;
+               }

        }
        }

-       return 0;
+       if (!has_alignment) {
+               fprintf(stderr, "[error] %s: missing alignment attribute\n", __func__);
+               return NULL;
+       }
+       if (!has_size) {
+               fprintf(stderr, "[error] %s: missing size attribute\n", __func__);
+               return NULL;
+       }
+       integer_declaration = integer_declaration_new(size,
+                               byte_order, signedness, alignment);
+       return &integer_declaration->p;

 }
 
 }
 

+/*
+ * Also add named variant, struct or enum to the current declaration scope.
+ */

 static
 static

-int ctf_typealias_visit(FILE *fd, int depth, struct ctf_node *target,
-               struct ctf_node *alias,
+struct declaration *ctf_declaration_specifier_visit(FILE *fd,
+               int depth, struct cds_list_head *head,

                struct declaration_scope *declaration_scope)
 {
                struct declaration_scope *declaration_scope)
 {

-       /*
-        * Build target type, check that it is reachable in current
-        * declaration scope.
-        */
+       struct declaration *declaration;
+       struct node *first;

 
 

-       /* Only one type declarator is allowed */
+       first = _cds_list_first_entry(head, struct node, siblings);

 
 

-       /* Build alias type, add to current declaration scope. */
-       /* Only one type declarator is allowed */
+       switch (first->type) {
+       case NODE_STRUCT:
+               return ctf_declaration_struct_visit(fd, depth,
+                       first->u._struct.name,
+                       &first->u._struct.declaration_list,
+                       first->u._struct.has_body,
+                       declaration_scope);
+       case NODE_VARIANT:
+               return ctf_declaration_variant_visit(fd, depth,
+                       first->u.variant.name,
+                       &first->u.variant.declaration_list,
+                       first->u.variant.has_body,
+                       declaration_scope);
+       case NODE_ENUM:
+               return ctf_declaration_enum_visit(fd, depth,
+                       first->u._enum.enum_id,
+                       first->u._enum.container_type,
+                       &first->u._enum.enumerator_list,
+                       first->u._enum.has_body);
+       case NODE_INTEGER:
+               return ctf_declaration_integer_visit(fd, depth,
+                       &first->u.integer.expressions);
+       case NODE_FLOATING_POINT:       /* TODO  */
+               return ctf_declaration_floating_point_visit(fd, depth,
+                       &first->u.floating_point.expressions);
+       case NODE_STRING:               /* TODO */
+               return ctf_declaration_string_visit(fd, depth,
+                       &first->u.string.expressions);
+       case NODE_TYPE_SPECIFIER:
+               return ctf_declaration_type_specifier_visit(fd, depth,
+                               head, declaration_scope);
+       }

 }
 
 static
 }
 
 static


@@ -1144,7 +1215,6 @@ int ctf_trace_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru
        return 0;
 }
 
        return 0;
 }
 

-

 static
 int ctf_trace_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace *trace)
 {
 static
 int ctf_trace_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace *trace)
 {


@@ -1234,229 +1304,6 @@ int _ctf_visitor(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace *t
                                return ret;
                }
                break;
                                return ret;
                }
                break;

-
-       case NODE_TYPEALIAS_TARGET:
-               print_tabs(fd, depth);
-               fprintf(fd, "<target>\n");
-               depth++;
-
-               print_tabs(fd, depth);
-               fprintf(fd, "<declaration_specifier>\n");
-               cds_list_for_each_entry(iter, &node->u.typealias_target.declaration_specifier, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</declaration_specifier>\n");
-
-               print_tabs(fd, depth);
-               fprintf(fd, "<type_declarators>\n");
-               cds_list_for_each_entry(iter, &node->u.typealias_target.type_declarators, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</type_declarators>\n");
-
-               depth--;
-               print_tabs(fd, depth);
-               fprintf(fd, "</target>\n");
-               break;
-       case NODE_TYPEALIAS_ALIAS:
-               print_tabs(fd, depth);
-               fprintf(fd, "<alias>\n");
-               depth++;
-
-               print_tabs(fd, depth);
-               fprintf(fd, "<declaration_specifier>\n");
-               cds_list_for_each_entry(iter, &node->u.typealias_alias.declaration_specifier, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</declaration_specifier>\n");
-
-               print_tabs(fd, depth);
-               fprintf(fd, "<type_declarators>\n");
-               cds_list_for_each_entry(iter, &node->u.typealias_alias.type_declarators, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</type_declarators>\n");
-
-               depth--;
-               print_tabs(fd, depth);
-               fprintf(fd, "</alias>\n");
-               break;
-       case NODE_TYPEALIAS:
-               print_tabs(fd, depth);
-               fprintf(fd, "<typealias>\n");
-               ret = ctf_visitor_print_xml(fd, depth + 1, node->u.typealias.target);
-               if (ret)
-                       return ret;
-               ret = ctf_visitor_print_xml(fd, depth + 1, node->u.typealias.alias);
-               if (ret)
-                       return ret;
-               print_tabs(fd, depth);
-               fprintf(fd, "</typealias>\n");
-               break;
-
-       case NODE_TYPE_SPECIFIER:
-               ret = ctf_visitor_print_type_specifier(fd, depth, node);
-               if (ret)
-                       return ret;
-               break;
-       case NODE_POINTER:
-               print_tabs(fd, depth);
-               if (node->u.pointer.const_qualifier)
-                       fprintf(fd, "<const_pointer />\n");
-               else
-                       fprintf(fd, "<pointer />\n");
-               break;
-       case NODE_TYPE_DECLARATOR:
-               ret = ctf_visitor_print_type_declarator(fd, depth, node);
-               if (ret)
-                       return ret;
-               break;
-
-       case NODE_FLOATING_POINT:
-               print_tabs(fd, depth);
-               fprintf(fd, "<floating_point>\n");
-               cds_list_for_each_entry(iter, &node->u.floating_point.expressions, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</floating_point>\n");
-               break;
-       case NODE_INTEGER:
-               print_tabs(fd, depth);
-               fprintf(fd, "<integer>\n");
-               cds_list_for_each_entry(iter, &node->u.integer.expressions, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</integer>\n");
-               break;
-       case NODE_STRING:
-               print_tabs(fd, depth);
-               fprintf(fd, "<string>\n");
-               cds_list_for_each_entry(iter, &node->u.string.expressions, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</string>\n");
-               break;
-       case NODE_ENUMERATOR:
-               print_tabs(fd, depth);
-               fprintf(fd, "<enumerator");
-               if (node->u.enumerator.id)
-                       fprintf(fd, " id=\"%s\"", node->u.enumerator.id);
-               fprintf(fd, ">\n");
-               cds_list_for_each_entry(iter, &node->u.enumerator.values, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</enumerator>\n");
-               break;
-       case NODE_ENUM:
-               print_tabs(fd, depth);
-               if (node->u._struct.name)
-                       fprintf(fd, "<enum name=\"%s\">\n",
-                               node->u._enum.enum_id);
-               else
-                       fprintf(fd, "<enum >\n");
-               depth++;
-
-               if (node->u._enum.container_type) {
-                       print_tabs(fd, depth);
-                       fprintf(fd, "<container_type>\n");
-                       ret = ctf_visitor_print_xml(fd, depth + 1, node->u._enum.container_type);
-                       if (ret)
-                               return ret;
-                       print_tabs(fd, depth);
-                       fprintf(fd, "</container_type>\n");
-               }
-
-               print_tabs(fd, depth);
-               fprintf(fd, "<enumerator_list>\n");
-               cds_list_for_each_entry(iter, &node->u._enum.enumerator_list, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</enumerator_list>\n");
-
-               depth--;
-               print_tabs(fd, depth);
-               fprintf(fd, "</enum>\n");
-               break;
-       case NODE_STRUCT_OR_VARIANT_DECLARATION:
-               print_tabs(fd, depth);
-               fprintf(fd, "<declaration_specifier>\n");
-               cds_list_for_each_entry(iter, &node->u.struct_or_variant_declaration.declaration_specifier, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</declaration_specifier>\n");
-
-               print_tabs(fd, depth);
-               fprintf(fd, "<type_declarators>\n");
-               cds_list_for_each_entry(iter, &node->u.struct_or_variant_declaration.type_declarators, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</type_declarators>\n");
-               break;
-       case NODE_VARIANT:
-               print_tabs(fd, depth);
-               fprintf(fd, "<variant");
-               if (node->u.variant.name)
-                       fprintf(fd, " name=\"%s\"", node->u.variant.name);
-               if (node->u.variant.choice)
-                       fprintf(fd, " choice=\"%s\"", node->u.variant.choice);
-               fprintf(fd, ">\n");
-               cds_list_for_each_entry(iter, &node->u.variant.declaration_list, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</variant>\n");
-               break;
-       case NODE_STRUCT:
-               print_tabs(fd, depth);
-               if (node->u._struct.name)
-                       fprintf(fd, "<struct name=\"%s\">\n",
-                               node->u._struct.name);
-               else
-                       fprintf(fd, "<struct>\n");
-               cds_list_for_each_entry(iter, &node->u._struct.declaration_list, siblings) {
-                       ret = ctf_visitor_print_xml(fd, depth + 1, iter);
-                       if (ret)
-                               return ret;
-               }
-               print_tabs(fd, depth);
-               fprintf(fd, "</struct>\n");
-               break;
-

        case NODE_UNKNOWN:
        default:
                fprintf(stderr, "[error] %s: unknown node type %d\n", __func__,
        case NODE_UNKNOWN:
        default:
                fprintf(stderr, "[error] %s: unknown node type %d\n", __func__,

diff --git a/formats/ctf/types/float.c b/formats/ctf/types/float.c
index ee9a8318660f115d5787f94cf50becd4ab99de70..72c779123bbd74e628e4a31b8eb0c847882c47cf 100644 (file)
--- a/formats/ctf/types/float.c
+++ b/formats/ctf/types/float.c
@@ -111,8 +111,8 @@ double ctf_double_read(struct stream_pos *srcp,
                       const struct declaration_float *float_declaration)
 {
        union doubleIEEE754 u;
                       const struct declaration_float *float_declaration)
 {
        union doubleIEEE754 u;

-       struct declaration_float *dest_declaration = float_declaration_new(NULL,
-                               DBL_MANT_DIG,
+       struct declaration_float *dest_declaration =
+               float_declaration_new(DBL_MANT_DIG,

                                sizeof(double) * CHAR_BIT - DBL_MANT_DIG,
                                BYTE_ORDER,
                                __alignof__(double));
                                sizeof(double) * CHAR_BIT - DBL_MANT_DIG,
                                BYTE_ORDER,
                                __alignof__(double));


@@ -130,8 +130,8 @@ void ctf_double_write(struct stream_pos *destp,
                      double v)
 {
        union doubleIEEE754 u;
                      double v)
 {
        union doubleIEEE754 u;

-       struct declaration_float *src_declaration = float_declaration_new(NULL,
-                               DBL_MANT_DIG,
+       struct declaration_float *src_declaration =
+               float_declaration_new(DBL_MANT_DIG,

                                sizeof(double) * CHAR_BIT - DBL_MANT_DIG,
                                BYTE_ORDER,
                                __alignof__(double));
                                sizeof(double) * CHAR_BIT - DBL_MANT_DIG,
                                BYTE_ORDER,
                                __alignof__(double));


@@ -148,8 +148,8 @@ long double ctf_ldouble_read(struct stream_pos *srcp,
                             const struct declaration_float *float_declaration)
 {
        union ldoubleIEEE754 u;
                             const struct declaration_float *float_declaration)
 {
        union ldoubleIEEE754 u;

-       struct declaration_float *dest_declaration = float_declaration_new(NULL,
-                               LDBL_MANT_DIG,
+       struct declaration_float *dest_declaration =
+               float_declaration_new(LDBL_MANT_DIG,

                                sizeof(long double) * CHAR_BIT - LDBL_MANT_DIG,
                                BYTE_ORDER,
                                __alignof__(long double));
                                sizeof(long double) * CHAR_BIT - LDBL_MANT_DIG,
                                BYTE_ORDER,
                                __alignof__(long double));


@@ -167,8 +167,8 @@ void ctf_ldouble_write(struct stream_pos *destp,
                       long double v)
 {
        union ldoubleIEEE754 u;
                       long double v)
 {
        union ldoubleIEEE754 u;

-       struct declaration_float *src_declaration = float_declaration_new(NULL,
-                               LDBL_MANT_DIG,
+       struct declaration_float *src_declaration =
+               float_declaration_new(LDBL_MANT_DIG,

                                sizeof(long double) * CHAR_BIT - LDBL_MANT_DIG,
                                BYTE_ORDER,
                                __alignof__(long double));
                                sizeof(long double) * CHAR_BIT - LDBL_MANT_DIG,
                                BYTE_ORDER,
                                __alignof__(long double));

diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h
index ad28ac0912c85e98e8bc2c27acd0474e446e1d47..37ee9291cb8ec052647bb430e5f236c0971f2bc9 100644 (file)
--- a/include/babeltrace/types.h
+++ b/include/babeltrace/types.h
@@ -398,18 +398,14 @@ void declaration_unref(struct declaration *declaration);
 void definition_ref(struct definition *definition);
 void definition_unref(struct definition *definition);
 
 void definition_ref(struct definition *definition);
 void definition_unref(struct definition *definition);
 

-/* Nameless declarations can be created by passing a NULL name */
-
-struct declaration_integer *integer_declaration_new(const char *name,
-                                     size_t len, int byte_order,
+struct declaration_integer *integer_declaration_new(size_t len, int byte_order,

                                      int signedness, size_t alignment);
 
 /*
  * mantissa_len is the length of the number of bytes represented by the mantissa
  * (e.g. result of DBL_MANT_DIG). It includes the leading 1.
  */
                                      int signedness, size_t alignment);
 
 /*
  * mantissa_len is the length of the number of bytes represented by the mantissa
  * (e.g. result of DBL_MANT_DIG). It includes the leading 1.
  */

-struct declaration_float *float_declaration_new(const char *name,
-                                 size_t mantissa_len,
+struct declaration_float *float_declaration_new(size_t mantissa_len,

                                  size_t exp_len, int byte_order,
                                  size_t alignment);
 
                                  size_t exp_len, int byte_order,
                                  size_t alignment);
 

diff --git a/types/float.c b/types/float.c
index eef123c8d05593c611ad527f929b383797618757..576f8622567c75af82bf3acfd91d8c9f321fe438 100644 (file)
--- a/types/float.c
+++ b/types/float.c
@@ -59,7 +59,7 @@ void _float_declaration_free(struct declaration *declaration)
 }
 
 struct declaration_float *
 }
 
 struct declaration_float *

-       float_declaration_new(const char *name, size_t mantissa_len,
+       float_declaration_new(size_t mantissa_len,

                       size_t exp_len, int byte_order, size_t alignment)
 {
        struct declaration_float *float_declaration;
                       size_t exp_len, int byte_order, size_t alignment)
 {
        struct declaration_float *float_declaration;


@@ -68,7 +68,6 @@ struct declaration_float *
        float_declaration = g_new(struct declaration_float, 1);
        declaration = &float_declaration->p;
        declaration->id = CTF_TYPE_FLOAT;
        float_declaration = g_new(struct declaration_float, 1);
        declaration = &float_declaration->p;
        declaration->id = CTF_TYPE_FLOAT;

-       declaration->name = g_quark_from_string(name);

        declaration->alignment = alignment;
        declaration->copy = float_copy;
        declaration->declaration_free = _float_declaration_free;
        declaration->alignment = alignment;
        declaration->copy = float_copy;
        declaration->declaration_free = _float_declaration_free;


@@ -77,11 +76,11 @@ struct declaration_float *
        declaration->ref = 1;
        float_declaration->byte_order = byte_order;
 
        declaration->ref = 1;
        float_declaration->byte_order = byte_order;
 

-       float_declaration->sign = integer_declaration_new(NULL, 1,
+       float_declaration->sign = integer_declaration_new(1,

                                            byte_order, false, 1);
                                            byte_order, false, 1);

-       float_declaration->mantissa = integer_declaration_new(NULL, mantissa_len - 1,
+       float_declaration->mantissa = integer_declaration_new(mantissa_len - 1,

                                                byte_order, false, 1);
                                                byte_order, false, 1);

-       float_declaration->exp = integer_declaration_new(NULL, exp_len,
+       float_declaration->exp = integer_declaration_new(exp_len,

                                           byte_order, true, 1);
        return float_declaration;
 }
                                           byte_order, true, 1);
        return float_declaration;
 }

diff --git a/types/integer.c b/types/integer.c
index 928e4960a3a18dab24b43d0266a93a730b5c2a61..7b7d22c8d4b1b48ebe12ed6c80550c1c8fd222dd 100644 (file)
--- a/types/integer.c
+++ b/types/integer.c
@@ -58,14 +58,13 @@ void _integer_declaration_free(struct declaration *declaration)
 }
 
 struct declaration_integer *
 }
 
 struct declaration_integer *

-       integer_declaration_new(const char *name, size_t len, int byte_order,
+       integer_declaration_new(size_t len, int byte_order,

                         int signedness, size_t alignment)
 {
        struct declaration_integer *integer_declaration;
 
        integer_declaration = g_new(struct declaration_integer, 1);
        integer_declaration->p.id = CTF_TYPE_INTEGER;
                         int signedness, size_t alignment)
 {
        struct declaration_integer *integer_declaration;
 
        integer_declaration = g_new(struct declaration_integer, 1);
        integer_declaration->p.id = CTF_TYPE_INTEGER;

-       integer_declaration->p.name = g_quark_from_string(name);

        integer_declaration->p.alignment = alignment;
        integer_declaration->p.copy = integer_copy;
        integer_declaration->p.declaration_free = _integer_declaration_free;
        integer_declaration->p.alignment = alignment;
        integer_declaration->p.copy = integer_copy;
        integer_declaration->p.declaration_free = _integer_declaration_free;