ctf.fs: bt_ctf_notif_iter_create(): assert() that all medops exist

[babeltrace.git] / formats / ctf / metadata / ctf-ast.h

diff --git a/formats/ctf/metadata/ctf-ast.h b/formats/ctf/metadata/ctf-ast.h
index 20ed6cccba77f68f1b1d07ca4b8a36363e93d69e..2ba6e860f4d7c920be57e6fc6f90626cb841e5a8 100644 (file)
--- a/formats/ctf/metadata/ctf-ast.h
+++ b/formats/ctf/metadata/ctf-ast.h
@@ -26,9 +26,6 @@
 // data is a pointer to a 'SParserParam' structure
 //#define YYPARSE_PARAM        scanner
 
-// the argument for the 'yylex' function
-#define YYLEX_PARAM    ((struct ctf_scanner *) scanner)->scanner
-
 struct ctf_node;
 struct ctf_parser;
 
@@ -75,8 +72,15 @@ struct ctf_node {
        struct ctf_node *parent;
        struct bt_list_head siblings;
        struct bt_list_head tmp_head;
-       struct bt_list_head gc;
        unsigned int lineno;
+       /*
+        * We mark nodes visited in the generate-io-struct phase (last
+        * phase). We only mark the 1-depth level nodes as visited
+        * (never the root node, and not their sub-nodes). This allows
+        * skipping already visited nodes when doing incremental
+        * metadata append.
+        */
+       int visited;
 
        enum node_type type;
        union {
@@ -148,7 +152,6 @@ struct ctf_node {
                                UNARY_SIGNED_CONSTANT,
                                UNARY_UNSIGNED_CONSTANT,
                                UNARY_SBRAC,
-                               UNARY_NESTED,
                        } type;
                        union {
                                /*
@@ -159,7 +162,6 @@ struct ctf_node {
                                int64_t signed_constant;
                                uint64_t unsigned_constant;
                                struct ctf_node *sbrac_exp;
-                               struct ctf_node *nested_exp;
                        } u;
                        enum {
                                UNARY_LINK_UNKNOWN = 0,
@@ -296,7 +298,6 @@ struct ctf_node {
 
 struct ctf_ast {
        struct ctf_node root;
-       struct bt_list_head allocated_nodes;
 };
 
 const char *node_type(struct ctf_node *node);