X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-ast.h;h=2ba6e860f4d7c920be57e6fc6f90626cb841e5a8;hb=f3985ab106d89d8e764c1a8dd0c8bda09b755d10;hp=8d2e5d776b838232de8ec5f5c08f18043f786618;hpb=eb31c5e6bbfbb02093ff45616446c26730898c05;p=babeltrace.git

diff --git a/formats/ctf/metadata/ctf-ast.h b/formats/ctf/metadata/ctf-ast.h
index 8d2e5d77..2ba6e860 100644
--- a/formats/ctf/metadata/ctf-ast.h
+++ b/formats/ctf/metadata/ctf-ast.h
@@ -26,44 +26,42 @@
 // 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;
 
-enum node_type {
-	NODE_UNKNOWN = 0,
-	NODE_ROOT,
-
-	NODE_EVENT,
-	NODE_STREAM,
-	NODE_ENV,
-	NODE_TRACE,
-	NODE_CLOCK,
-
-	NODE_CTF_EXPRESSION,
-	NODE_UNARY_EXPRESSION,
-
-	NODE_TYPEDEF,
-	NODE_TYPEALIAS_TARGET,
-	NODE_TYPEALIAS_ALIAS,
-	NODE_TYPEALIAS,
-
-	NODE_TYPE_SPECIFIER,
-	NODE_TYPE_SPECIFIER_LIST,
-	NODE_POINTER,
-	NODE_TYPE_DECLARATOR,
-
-	NODE_FLOATING_POINT,
-	NODE_INTEGER,
-	NODE_STRING,
-	NODE_ENUMERATOR,
-	NODE_ENUM,
-	NODE_STRUCT_OR_VARIANT_DECLARATION,
-	NODE_VARIANT,
-	NODE_STRUCT,
+#define FOREACH_CTF_NODES(F) \
+	F(NODE_UNKNOWN) \
+	F(NODE_ROOT) \
+	F(NODE_ERROR) \
+	F(NODE_EVENT) \
+	F(NODE_STREAM) \
+	F(NODE_ENV) \
+	F(NODE_TRACE) \
+	F(NODE_CLOCK) \
+	F(NODE_CALLSITE) \
+	F(NODE_CTF_EXPRESSION) \
+	F(NODE_UNARY_EXPRESSION) \
+	F(NODE_TYPEDEF) \
+	F(NODE_TYPEALIAS_TARGET) \
+	F(NODE_TYPEALIAS_ALIAS) \
+	F(NODE_TYPEALIAS) \
+	F(NODE_TYPE_SPECIFIER) \
+	F(NODE_TYPE_SPECIFIER_LIST) \
+	F(NODE_POINTER) \
+	F(NODE_TYPE_DECLARATOR) \
+	F(NODE_FLOATING_POINT) \
+	F(NODE_INTEGER) \
+	F(NODE_STRING) \
+	F(NODE_ENUMERATOR) \
+	F(NODE_ENUM) \
+	F(NODE_STRUCT_OR_VARIANT_DECLARATION) \
+	F(NODE_VARIANT) \
+	F(NODE_STRUCT)
 
+enum node_type {
+#define ENTRY(S)	S,
+	FOREACH_CTF_NODES(ENTRY)
+#undef ENTRY
 	NR_NODE_TYPES,
 };
 
@@ -74,7 +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 {
@@ -91,6 +97,7 @@ struct ctf_node {
 			struct bt_list_head stream;
 			struct bt_list_head event;
 			struct bt_list_head clock;
+			struct bt_list_head callsite;
 		} root;
 		struct {
 			/*
@@ -127,6 +134,13 @@ struct ctf_node {
 			 */
 			struct bt_list_head declaration_list;
 		} clock;
+		struct {
+			/*
+			 * Children nodes are ctf_expression, typedef,
+			 * typealias and type_specifier_list.
+			 */
+			struct bt_list_head declaration_list;
+		} callsite;
 		struct {
 			struct bt_list_head left;	/* Should be string */
 			struct bt_list_head right;	/* Unary exp. or type */
@@ -138,7 +152,6 @@ struct ctf_node {
 				UNARY_SIGNED_CONSTANT,
 				UNARY_UNSIGNED_CONSTANT,
 				UNARY_SBRAC,
-				UNARY_NESTED,
 			} type;
 			union {
 				/*
@@ -149,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,
@@ -286,17 +298,22 @@ struct ctf_node {
 
 struct ctf_ast {
 	struct ctf_node root;
-	struct bt_list_head allocated_nodes;
 };
 
 const char *node_type(struct ctf_node *node);
 
 struct ctf_trace;
 
+BT_HIDDEN
 int ctf_visitor_print_xml(FILE *fd, int depth, struct ctf_node *node);
+BT_HIDDEN
 int ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node);
+BT_HIDDEN
 int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node);
+BT_HIDDEN
 int ctf_visitor_construct_metadata(FILE *fd, int depth, struct ctf_node *node,
 			struct ctf_trace *trace, int byte_order);
+BT_HIDDEN
+int ctf_destroy_metadata(struct ctf_trace *trace);
 
 #endif /* _CTF_AST_H */