Parse clock descriptions

Parse basic clock descriptions and integer "map = identifiers...;".

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 f21dda01143be72f5381f7881676f5c92d934907..40298b8e506821cb520f444d06115bf752e647ac 100644 (file)
--- a/formats/ctf/metadata/ctf-ast.h
+++ b/formats/ctf/metadata/ctf-ast.h
@@ -23,6 +23,7 @@ enum node_type {
        NODE_EVENT,
        NODE_STREAM,
        NODE_TRACE,
        NODE_EVENT,
        NODE_STREAM,
        NODE_TRACE,

+       NODE_CLOCK,

 
        NODE_CTF_EXPRESSION,
        NODE_UNARY_EXPRESSION,
 
        NODE_CTF_EXPRESSION,
        NODE_UNARY_EXPRESSION,


@@ -71,6 +72,7 @@ struct ctf_node {
                        struct cds_list_head trace;
                        struct cds_list_head stream;
                        struct cds_list_head event;
                        struct cds_list_head trace;
                        struct cds_list_head stream;
                        struct cds_list_head event;

+                       struct cds_list_head clock;

                } root;
                struct {
                        /*
                } root;
                struct {
                        /*


@@ -93,6 +95,13 @@ struct ctf_node {
                         */
                        struct cds_list_head declaration_list;
                } trace;
                         */
                        struct cds_list_head declaration_list;
                } trace;

+               struct {
+                       /*
+                        * Children nodes are ctf_expression, typedef,
+                        * typealias and type_specifier_list.
+                        */
+                       struct cds_list_head declaration_list;
+               } clock;

                struct {
                        struct cds_list_head left;      /* Should be string */
                        struct cds_list_head right;     /* Unary exp. or type */
                struct {
                        struct cds_list_head left;      /* Should be string */
                        struct cds_list_head right;     /* Unary exp. or type */

diff --git a/formats/ctf/metadata/ctf-lexer.l b/formats/ctf/metadata/ctf-lexer.l
index 7a0e73fe1abb7c8e73690fe64f645c4242f25227..f5ff02f1aa17084b9b1c1e920d6317e7194b3252 100644 (file)
--- a/formats/ctf/metadata/ctf-lexer.l
+++ b/formats/ctf/metadata/ctf-lexer.l
@@ -96,6 +96,7 @@ L\"                           BEGIN(string_lit); return STRING_LITERAL_START;
 align                          setstring(yyextra, yylval, yytext); return TOK_ALIGN;
 const                          setstring(yyextra, yylval, yytext); return CONST;
 char                           setstring(yyextra, yylval, yytext); return CHAR;
 align                          setstring(yyextra, yylval, yytext); return TOK_ALIGN;
 const                          setstring(yyextra, yylval, yytext); return CONST;
 char                           setstring(yyextra, yylval, yytext); return CHAR;

+clock                          setstring(yyextra, yylval, yytext); return CLOCK;

 double                         setstring(yyextra, yylval, yytext); return DOUBLE;
 enum                           setstring(yyextra, yylval, yytext); return ENUM;
 event                          setstring(yyextra, yylval, yytext); return EVENT;
 double                         setstring(yyextra, yylval, yytext); return DOUBLE;
 enum                           setstring(yyextra, yylval, yytext); return ENUM;
 event                          setstring(yyextra, yylval, yytext); return EVENT;

diff --git a/formats/ctf/metadata/ctf-parser.y b/formats/ctf/metadata/ctf-parser.y
index d216cd0e6479acd1cb65a626336bf59b85539d2b..78b63cc36d6adfbd4c465072418e2ed0b602f012 100644 (file)
--- a/formats/ctf/metadata/ctf-parser.y
+++ b/formats/ctf/metadata/ctf-parser.y
@@ -66,6 +66,7 @@ static const char *node_type_to_str[] = {
        [ NODE_EVENT ] = "NODE_EVENT",
        [ NODE_STREAM ] = "NODE_STREAM",
        [ NODE_TRACE ] = "NODE_TRACE",
        [ NODE_EVENT ] = "NODE_EVENT",
        [ NODE_STREAM ] = "NODE_STREAM",
        [ NODE_TRACE ] = "NODE_TRACE",

+       [ NODE_CLOCK ] = "NODE_CLOCK",

        [ NODE_CTF_EXPRESSION ] = "NODE_CTF_EXPRESSION",
        [ NODE_UNARY_EXPRESSION ] = "NODE_UNARY_EXPRESSION",
        [ NODE_TYPEDEF ] = "NODE_TYPEDEF",
        [ NODE_CTF_EXPRESSION ] = "NODE_CTF_EXPRESSION",
        [ NODE_UNARY_EXPRESSION ] = "NODE_UNARY_EXPRESSION",
        [ NODE_TYPEDEF ] = "NODE_TYPEDEF",


@@ -246,6 +247,9 @@ static struct ctf_node *make_node(struct ctf_scanner *scanner,
        case NODE_TRACE:
                CDS_INIT_LIST_HEAD(&node->u.trace.declaration_list);
                break;
        case NODE_TRACE:
                CDS_INIT_LIST_HEAD(&node->u.trace.declaration_list);
                break;

+       case NODE_CLOCK:
+               CDS_INIT_LIST_HEAD(&node->u.clock.declaration_list);
+               break;

 
        case NODE_CTF_EXPRESSION:
                CDS_INIT_LIST_HEAD(&node->u.ctf_expression.left);
 
        case NODE_CTF_EXPRESSION:
                CDS_INIT_LIST_HEAD(&node->u.ctf_expression.left);


@@ -326,6 +330,9 @@ static int reparent_ctf_expression(struct ctf_node *node,
        case NODE_TRACE:
                _cds_list_splice_tail(&node->tmp_head, &parent->u.trace.declaration_list);
                break;
        case NODE_TRACE:
                _cds_list_splice_tail(&node->tmp_head, &parent->u.trace.declaration_list);
                break;

+       case NODE_CLOCK:
+               _cds_list_splice_tail(&node->tmp_head, &parent->u.clock.declaration_list);
+               break;

        case NODE_FLOATING_POINT:
                _cds_list_splice_tail(&node->tmp_head, &parent->u.floating_point.expressions);
                break;
        case NODE_FLOATING_POINT:
                _cds_list_splice_tail(&node->tmp_head, &parent->u.floating_point.expressions);
                break;


@@ -378,6 +385,9 @@ static int reparent_typedef(struct ctf_node *node, struct ctf_node *parent)
        case NODE_TRACE:
                _cds_list_splice_tail(&node->tmp_head, &parent->u.trace.declaration_list);
                break;
        case NODE_TRACE:
                _cds_list_splice_tail(&node->tmp_head, &parent->u.trace.declaration_list);
                break;

+       case NODE_CLOCK:
+               _cds_list_splice_tail(&node->tmp_head, &parent->u.clock.declaration_list);
+               break;

        case NODE_VARIANT:
                _cds_list_splice_tail(&node->tmp_head, &parent->u.variant.declaration_list);
                break;
        case NODE_VARIANT:
                _cds_list_splice_tail(&node->tmp_head, &parent->u.variant.declaration_list);
                break;


@@ -427,6 +437,9 @@ static int reparent_typealias(struct ctf_node *node, struct ctf_node *parent)
        case NODE_TRACE:
                _cds_list_splice_tail(&node->tmp_head, &parent->u.trace.declaration_list);
                break;
        case NODE_TRACE:
                _cds_list_splice_tail(&node->tmp_head, &parent->u.trace.declaration_list);
                break;

+       case NODE_CLOCK:
+               _cds_list_splice_tail(&node->tmp_head, &parent->u.clock.declaration_list);
+               break;

        case NODE_VARIANT:
                _cds_list_splice_tail(&node->tmp_head, &parent->u.variant.declaration_list);
                break;
        case NODE_VARIANT:
                _cds_list_splice_tail(&node->tmp_head, &parent->u.variant.declaration_list);
                break;


@@ -473,6 +486,7 @@ static int reparent_type_specifier(struct ctf_node *node,
        case NODE_EVENT:
        case NODE_STREAM:
        case NODE_TRACE:
        case NODE_EVENT:
        case NODE_STREAM:
        case NODE_TRACE:

+       case NODE_CLOCK:

        case NODE_VARIANT:
        case NODE_STRUCT:
        case NODE_TYPEDEF:
        case NODE_VARIANT:
        case NODE_STRUCT:
        case NODE_TYPEDEF:


@@ -516,6 +530,9 @@ static int reparent_type_specifier_list(struct ctf_node *node,
        case NODE_TRACE:
                cds_list_add_tail(&node->siblings, &parent->u.trace.declaration_list);
                break;
        case NODE_TRACE:
                cds_list_add_tail(&node->siblings, &parent->u.trace.declaration_list);
                break;

+       case NODE_CLOCK:
+               cds_list_add_tail(&node->siblings, &parent->u.clock.declaration_list);
+               break;

        case NODE_VARIANT:
                cds_list_add_tail(&node->siblings, &parent->u.variant.declaration_list);
                break;
        case NODE_VARIANT:
                cds_list_add_tail(&node->siblings, &parent->u.variant.declaration_list);
                break;


@@ -583,6 +600,7 @@ static int reparent_type_declarator(struct ctf_node *node,
        case NODE_EVENT:
        case NODE_STREAM:
        case NODE_TRACE:
        case NODE_EVENT:
        case NODE_STREAM:
        case NODE_TRACE:

+       case NODE_CLOCK:

        case NODE_VARIANT:
        case NODE_STRUCT:
        case NODE_TYPEALIAS:
        case NODE_VARIANT:
        case NODE_STRUCT:
        case NODE_TYPEALIAS:


@@ -648,6 +666,13 @@ static int set_parent_node(struct ctf_node *node,
                        return -EPERM;
                }
                break;
                        return -EPERM;
                }
                break;

+       case NODE_CLOCK:
+               if (parent->type == NODE_ROOT) {
+                       _cds_list_splice_tail(&node->tmp_head, &parent->u.root.clock);
+               } else {
+                       return -EPERM;
+               }
+               break;

 
        case NODE_CTF_EXPRESSION:
                return reparent_ctf_expression(node, parent);
 
        case NODE_CTF_EXPRESSION:
                return reparent_ctf_expression(node, parent);


@@ -764,6 +789,7 @@ static struct ctf_ast *ctf_ast_alloc(void)
        CDS_INIT_LIST_HEAD(&ast->root.u.root.trace);
        CDS_INIT_LIST_HEAD(&ast->root.u.root.stream);
        CDS_INIT_LIST_HEAD(&ast->root.u.root.event);
        CDS_INIT_LIST_HEAD(&ast->root.u.root.trace);
        CDS_INIT_LIST_HEAD(&ast->root.u.root.stream);
        CDS_INIT_LIST_HEAD(&ast->root.u.root.event);

+       CDS_INIT_LIST_HEAD(&ast->root.u.root.clock);

        return ast;
 }
 
        return ast;
 }
 


@@ -852,7 +878,7 @@ void ctf_scanner_free(struct ctf_scanner *scanner)
  */
 %expect 2
 %start file
  */
 %expect 2
 %start file

-%token CHARACTER_CONSTANT_START SQUOTE STRING_LITERAL_START DQUOTE ESCSEQ CHAR_STRING_TOKEN LSBRAC RSBRAC LPAREN RPAREN LBRAC RBRAC RARROW STAR PLUS MINUS LT GT TYPEASSIGN COLON SEMICOLON DOTDOTDOT DOT EQUAL COMMA CONST CHAR DOUBLE ENUM EVENT FLOATING_POINT FLOAT INTEGER INT LONG SHORT SIGNED STREAM STRING STRUCT TRACE TYPEALIAS TYPEDEF UNSIGNED VARIANT VOID _BOOL _COMPLEX _IMAGINARY DECIMAL_CONSTANT OCTAL_CONSTANT HEXADECIMAL_CONSTANT TOK_ALIGN
+%token CHARACTER_CONSTANT_START SQUOTE STRING_LITERAL_START DQUOTE ESCSEQ CHAR_STRING_TOKEN LSBRAC RSBRAC LPAREN RPAREN LBRAC RBRAC RARROW STAR PLUS MINUS LT GT TYPEASSIGN COLON SEMICOLON DOTDOTDOT DOT EQUAL COMMA CONST CHAR DOUBLE ENUM EVENT FLOATING_POINT FLOAT INTEGER INT LONG SHORT SIGNED STREAM STRING STRUCT TRACE CLOCK TYPEALIAS TYPEDEF UNSIGNED VARIANT VOID _BOOL _COMPLEX _IMAGINARY DECIMAL_CONSTANT OCTAL_CONSTANT HEXADECIMAL_CONSTANT TOK_ALIGN

 %token <gs> IDENTIFIER ID_TYPE
 %token ERROR
 %union
 %token <gs> IDENTIFIER ID_TYPE
 %token ERROR
 %union


@@ -872,6 +898,7 @@ void ctf_scanner_free(struct ctf_scanner *scanner)
 %type <n> event_declaration
 %type <n> stream_declaration
 %type <n> trace_declaration
 %type <n> event_declaration
 %type <n> stream_declaration
 %type <n> trace_declaration

+%type <n> clock_declaration

 %type <n> integer_declaration_specifiers
 %type <n> declaration_specifiers
 %type <n> alias_declaration_specifiers
 %type <n> integer_declaration_specifiers
 %type <n> declaration_specifiers
 %type <n> alias_declaration_specifiers


@@ -964,6 +991,8 @@ keywords:
                {       $$ = yylval.gs;         }
        |       TRACE
                {       $$ = yylval.gs;         }
                {       $$ = yylval.gs;         }
        |       TRACE
                {       $$ = yylval.gs;         }

+       |       CLOCK
+               {       $$ = yylval.gs;         }

        |       TOK_ALIGN
                {       $$ = yylval.gs;         }
        ;
        |       TOK_ALIGN
                {       $$ = yylval.gs;         }
        ;


@@ -1161,6 +1190,8 @@ declaration:
                {       $$ = $1;        }
        |       trace_declaration
                {       $$ = $1;        }
                {       $$ = $1;        }
        |       trace_declaration
                {       $$ = $1;        }

+       |       clock_declaration
+               {       $$ = $1;        }

        |       declaration_specifiers TYPEDEF declaration_specifiers type_declarator_list SEMICOLON
                {
                        struct ctf_node *list;
        |       declaration_specifiers TYPEDEF declaration_specifiers type_declarator_list SEMICOLON
                {
                        struct ctf_node *list;


@@ -1259,7 +1290,6 @@ stream_declaration_end:
                {       pop_scope(scanner);     }
        ;
 
                {       pop_scope(scanner);     }
        ;
 

-

 trace_declaration:
                trace_declaration_begin trace_declaration_end
                {
 trace_declaration:
                trace_declaration_begin trace_declaration_end
                {


@@ -1283,6 +1313,29 @@ trace_declaration_end:
                {       pop_scope(scanner);     }
        ;
 
                {       pop_scope(scanner);     }
        ;
 

+clock_declaration:
+               CLOCK clock_declaration_begin clock_declaration_end
+               {
+                       $$ = make_node(scanner, NODE_CLOCK);
+               }
+       |       CLOCK clock_declaration_begin ctf_assignment_expression_list clock_declaration_end
+               {
+                       $$ = make_node(scanner, NODE_CLOCK);
+                       if (set_parent_node($3, $$))
+                               reparent_error(scanner, "trace_declaration");
+               }
+       ;
+
+clock_declaration_begin:
+               LBRAC
+               {       push_scope(scanner);    }
+       ;
+
+clock_declaration_end:
+               RBRAC SEMICOLON
+               {       pop_scope(scanner);     }
+       ;
+

 integer_declaration_specifiers:
                CONST
                {
 integer_declaration_specifiers:
                CONST
                {

diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
index 6e828fcd13059b20f466a53eb07f4ea7cf59a23a..9d9a6f2b8bb997953781f5edba32459e105b175d 100644 (file)
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -1234,6 +1234,22 @@ struct declaration *ctf_declaration_integer_visit(FILE *fd, int depth,
                                return NULL;
                        }
                        g_free(s_right);
                                return NULL;
                        }
                        g_free(s_right);

+               } else if (!strcmp(left->u.unary_expression.u.string, "map")) {
+                       char *s_right;
+
+                       if (right->u.unary_expression.type != UNARY_STRING) {
+                               fprintf(fd, "[error] %s: map: expecting identifier\n",
+                                       __func__);
+                               return NULL;
+                       }
+                       s_right = concatenate_unary_strings(&expression->u.ctf_expression.right);
+                       if (!s_right) {
+                               fprintf(fd, "[error] %s: unexpected unary expression for integer map\n", __func__);
+                               g_free(s_right);
+                               return NULL;
+                       }
+                       /* TODO: lookup */
+

                } else {
                        fprintf(fd, "[error] %s: unknown attribute name %s\n",
                                __func__, left->u.unary_expression.u.string);
                } else {
                        fprintf(fd, "[error] %s: unknown attribute name %s\n",
                                __func__, left->u.unary_expression.u.string);

diff --git a/formats/ctf/metadata/ctf-visitor-parent-links.c b/formats/ctf/metadata/ctf-visitor-parent-links.c
index 3dea11a01798c8dc748ecfaae00f12c667112a47..4f987211cd276595f4013da17dd1647634768b8e 100644 (file)
--- a/formats/ctf/metadata/ctf-visitor-parent-links.c
+++ b/formats/ctf/metadata/ctf-visitor-parent-links.c
@@ -205,6 +205,12 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
                        if (ret)
                                return ret;
                }
                        if (ret)
                                return ret;
                }

+               cds_list_for_each_entry(iter, &node->u.root.clock, siblings) {
+                       iter->parent = node;
+                       ret = ctf_visitor_parent_links(fd, depth + 1, iter);
+                       if (ret)
+                               return ret;
+               }

                break;
 
        case NODE_EVENT:
                break;
 
        case NODE_EVENT:


@@ -231,6 +237,14 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
                                return ret;
                }
                break;
                                return ret;
                }
                break;

+       case NODE_CLOCK:
+               cds_list_for_each_entry(iter, &node->u.clock.declaration_list, siblings) {
+                       iter->parent = node;
+                       ret = ctf_visitor_parent_links(fd, depth + 1, iter);
+                       if (ret)
+                               return ret;
+               }
+               break;

 
        case NODE_CTF_EXPRESSION:
                depth++;
 
        case NODE_CTF_EXPRESSION:
                depth++;

diff --git a/formats/ctf/metadata/ctf-visitor-semantic-validator.c b/formats/ctf/metadata/ctf-visitor-semantic-validator.c
index eab4391b7007015df38504a7d1f6efe9acc2e3a1..da813e0a50acf6ce1b9eacde0e6caaaf81b15fde 100644 (file)
--- a/formats/ctf/metadata/ctf-visitor-semantic-validator.c
+++ b/formats/ctf/metadata/ctf-visitor-semantic-validator.c
@@ -108,6 +108,7 @@ int ctf_visitor_unary_expression(FILE *fd, int depth, struct ctf_node *node)
        case NODE_EVENT:
        case NODE_STREAM:
        case NODE_TRACE:
        case NODE_EVENT:
        case NODE_STREAM:
        case NODE_TRACE:

+       case NODE_CLOCK:

        case NODE_TYPEDEF:
        case NODE_TYPEALIAS_TARGET:
        case NODE_TYPEALIAS_ALIAS:
        case NODE_TYPEDEF:
        case NODE_TYPEALIAS_TARGET:
        case NODE_TYPEALIAS_ALIAS:


@@ -210,6 +211,7 @@ int ctf_visitor_type_specifier_list(FILE *fd, int depth, struct ctf_node *node)
        case NODE_EVENT:
        case NODE_STREAM:
        case NODE_TRACE:
        case NODE_EVENT:
        case NODE_STREAM:
        case NODE_TRACE:

+       case NODE_CLOCK:

        case NODE_UNARY_EXPRESSION:
        case NODE_TYPEALIAS:
        case NODE_TYPE_SPECIFIER:
        case NODE_UNARY_EXPRESSION:
        case NODE_TYPEALIAS:
        case NODE_TYPE_SPECIFIER:


@@ -249,6 +251,7 @@ int ctf_visitor_type_specifier(FILE *fd, int depth, struct ctf_node *node)
        case NODE_EVENT:
        case NODE_STREAM:
        case NODE_TRACE:
        case NODE_EVENT:
        case NODE_STREAM:
        case NODE_TRACE:

+       case NODE_CLOCK:

        case NODE_UNARY_EXPRESSION:
        case NODE_TYPEALIAS:
        case NODE_TYPE_SPECIFIER:
        case NODE_UNARY_EXPRESSION:
        case NODE_TYPEALIAS:
        case NODE_TYPE_SPECIFIER:


@@ -329,6 +332,7 @@ int ctf_visitor_type_declarator(FILE *fd, int depth, struct ctf_node *node)
        case NODE_EVENT:
        case NODE_STREAM:
        case NODE_TRACE:
        case NODE_EVENT:
        case NODE_STREAM:
        case NODE_TRACE:

+       case NODE_CLOCK:

        case NODE_CTF_EXPRESSION:
        case NODE_UNARY_EXPRESSION:
        case NODE_TYPEALIAS:
        case NODE_CTF_EXPRESSION:
        case NODE_UNARY_EXPRESSION:
        case NODE_TYPEALIAS:


@@ -480,6 +484,21 @@ int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
                                return ret;
                }
                break;
                                return ret;
                }
                break;

+       case NODE_CLOCK:
+               switch (node->parent->type) {
+               case NODE_ROOT:
+                       break;                  /* OK */
+               default:
+                       goto errinval;
+               }
+
+               cds_list_for_each_entry(iter, &node->u.clock.declaration_list, siblings) {
+                       ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
+                       if (ret)
+                               return ret;
+               }
+               break;
+

 
        case NODE_CTF_EXPRESSION:
                switch (node->parent->type) {
 
        case NODE_CTF_EXPRESSION:
                switch (node->parent->type) {


@@ -487,6 +506,7 @@ int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
                case NODE_EVENT:
                case NODE_STREAM:
                case NODE_TRACE:
                case NODE_EVENT:
                case NODE_STREAM:
                case NODE_TRACE:

+               case NODE_CLOCK:

                case NODE_FLOATING_POINT:
                case NODE_INTEGER:
                case NODE_STRING:
                case NODE_FLOATING_POINT:
                case NODE_INTEGER:
                case NODE_STRING:


@@ -553,6 +573,7 @@ int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
                case NODE_STRING:
                case NODE_ENUMERATOR:
                case NODE_ENUM:
                case NODE_STRING:
                case NODE_ENUMERATOR:
                case NODE_ENUM:

+               case NODE_CLOCK:

                default:
                        goto errinval;
                }
                default:
                        goto errinval;
                }


@@ -657,6 +678,7 @@ int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
                case NODE_STRING:
                case NODE_ENUMERATOR:
                case NODE_ENUM:
                case NODE_STRING:
                case NODE_ENUMERATOR:
                case NODE_ENUM:

+               case NODE_CLOCK:

                default:
                        goto errinval;
                }
                default:
                        goto errinval;
                }