X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-visitor-generate-io-struct.c;h=3b2fc78263b2e55904d89d871939120451dead9f;hp=98169457ffab32825580f57a0d79b7e8663a399d;hb=4c624781260fac44edf38ebfd63aee200c889cd6;hpb=4e752ebc939db830c9d7e7c763f415744c9fc688

diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
index 98169457..3b2fc782 100644
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -255,7 +255,7 @@ int get_unary_uuid(struct bt_list_head *head, unsigned char *uuid)
 				|| i != 0)
 			return -EINVAL;
 		src_string = node->u.unary_expression.u.string;
-		ret = babeltrace_uuid_parse(src_string, uuid);
+		ret = bt_uuid_parse(src_string, uuid);
 	}
 	return ret;
 }
@@ -994,7 +994,7 @@ int ctf_enumerator_list_visit(FILE *fd, int depth,
 
 	q = g_quark_from_string(enumerator->u.enumerator.id);
 	if (enum_declaration->integer_declaration->signedness) {
-		int64_t start, end;
+		int64_t start = 0, end = 0;
 		int nr_vals = 0;
 
 		bt_list_for_each_entry(iter, &enumerator->u.enumerator.values, siblings) {
@@ -1031,7 +1031,7 @@ int ctf_enumerator_list_visit(FILE *fd, int depth,
 		last->u.s = end + 1;
 		bt_enum_signed_insert(enum_declaration, start, end, q);
 	} else {
-		uint64_t start, end;
+		uint64_t start = 0, end = 0;
 		int nr_vals = 0;
 
 		bt_list_for_each_entry(iter, &enumerator->u.enumerator.values, siblings) {
@@ -1854,6 +1854,10 @@ int ctf_event_visit(FILE *fd, int depth, struct ctf_node *node,
 	struct ctf_event_declaration *event;
 	struct bt_ctf_event_decl *event_decl;
 
+	if (node->visited)
+		return 0;
+	node->visited = 1;
+
 	event_decl = g_new0(struct bt_ctf_event_decl, 1);
 	event = &event_decl->parent;
 	event->declaration_scope = bt_new_declaration_scope(parent_declaration_scope);
@@ -2051,6 +2055,12 @@ int ctf_stream_visit(FILE *fd, int depth, struct ctf_node *node,
 	struct ctf_node *iter;
 	struct ctf_stream_declaration *stream;
 
+	if (node) {
+		if (node->visited)
+			return 0;
+		node->visited = 1;
+	}
+
 	stream = g_new0(struct ctf_stream_declaration, 1);
 	stream->declaration_scope = bt_new_declaration_scope(parent_declaration_scope);
 	stream->events_by_id = g_ptr_array_new();
@@ -2168,7 +2178,7 @@ int ctf_trace_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru
 				goto error;
 			}
 			if (CTF_TRACE_FIELD_IS_SET(trace, uuid)
-				&& babeltrace_uuid_compare(uuid, trace->uuid)) {
+				&& bt_uuid_compare(uuid, trace->uuid)) {
 				fprintf(fd, "[error] %s: uuid mismatch\n", __func__);
 				ret = -EPERM;
 				goto error;
@@ -2250,8 +2260,13 @@ int ctf_trace_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace
 	int ret = 0;
 	struct ctf_node *iter;
 
+	if (!trace->restart_root_decl && node->visited)
+		return 0;
+	node->visited = 1;
+
 	if (trace->declaration_scope)
 		return -EEXIST;
+
 	trace->declaration_scope = bt_new_declaration_scope(trace->root_declaration_scope);
 	trace->streams = g_ptr_array_new();
 	trace->event_declarations = g_ptr_array_new();
@@ -2443,6 +2458,10 @@ int ctf_clock_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace
 	struct ctf_node *iter;
 	struct ctf_clock *clock;
 
+	if (node->visited)
+		return 0;
+	node->visited = 1;
+
 	clock = g_new0(struct ctf_clock, 1);
 	/* Default clock frequency is set to 1000000000 */
 	clock->freq = 1000000000ULL;
@@ -2633,6 +2652,10 @@ int ctf_callsite_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_tr
 	struct ctf_callsite *callsite;
 	struct ctf_callsite_dups *cs_dups;
 
+	if (node->visited)
+		return 0;
+	node->visited = 1;
+
 	callsite = g_new0(struct ctf_callsite, 1);
 	bt_list_for_each_entry(iter, &node->u.callsite.declaration_list, siblings) {
 		ret = ctf_callsite_declaration_visit(fd, depth + 1, iter, callsite, trace);
@@ -2769,6 +2792,22 @@ int ctf_env_declaration_visit(FILE *fd, int depth, struct ctf_node *node,
 			env->domain[TRACER_ENV_LEN - 1] = '\0';
 			printf_verbose("env.domain = \"%s\"\n", env->domain);
 			g_free(right);
+		} else if (!strcmp(left, "tracer_name")) {
+			char *right;
+
+			if (env->tracer_name[0]) {
+				fprintf(fd, "[warning] %s: duplicated env tracer_name\n", __func__);
+				goto error;	/* ret is 0, so not an actual error, just warn. */
+			}
+			right = concatenate_unary_strings(&node->u.ctf_expression.right);
+			if (!right) {
+				fprintf(fd, "[warning] %s: unexpected unary expression for env tracer_name\n", __func__);
+				goto error;	/* ret is 0, so not an actual error, just warn. */
+			}
+			strncpy(env->tracer_name, right, TRACER_ENV_LEN);
+			env->tracer_name[TRACER_ENV_LEN - 1] = '\0';
+			printf_verbose("env.tracer_name = \"%s\"\n", env->tracer_name);
+			g_free(right);
 		} else if (!strcmp(left, "sysname")) {
 			char *right;
 
@@ -2867,6 +2906,10 @@ int ctf_env_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace *
 	int ret = 0;
 	struct ctf_node *iter;
 
+	if (node->visited)
+		return 0;
+	node->visited = 1;
+
 	trace->env.vpid = -1;
 	trace->env.procname[0] = '\0';
 	trace->env.hostname[0] = '\0';
@@ -2888,6 +2931,10 @@ int ctf_root_declaration_visit(FILE *fd, int depth, struct ctf_node *node, struc
 {
 	int ret = 0;
 
+	if (!trace->restart_root_decl && node->visited)
+		return 0;
+	node->visited = 1;
+
 	switch (node->type) {
 	case NODE_TYPEDEF:
 		ret = ctf_typedef_visit(fd, depth + 1,
@@ -2933,7 +2980,6 @@ int ctf_visitor_construct_metadata(FILE *fd, int depth, struct ctf_node *node,
 {
 	int ret = 0;
 	struct ctf_node *iter;
-	int env_clock_done = 0;
 
 	printf_verbose("CTF visitor: metadata construction...\n");
 	trace->byte_order = byte_order;
@@ -2947,24 +2993,21 @@ retry:
 
 	switch (node->type) {
 	case NODE_ROOT:
-		if (!env_clock_done) {
-			/*
-			 * declarations need to query clock hash table,
-			 * so clock need to be treated first.
-			 */
-			if (bt_list_empty(&node->u.root.clock)) {
-				ctf_clock_default(fd, depth + 1, trace);
-			} else {
-				bt_list_for_each_entry(iter, &node->u.root.clock, siblings) {
-					ret = ctf_clock_visit(fd, depth + 1, iter,
-							      trace);
-					if (ret) {
-						fprintf(fd, "[error] %s: clock declaration error\n", __func__);
-						goto error;
-					}
+		/*
+		 * declarations need to query clock hash table,
+		 * so clock need to be treated first.
+		 */
+		if (bt_list_empty(&node->u.root.clock)) {
+			ctf_clock_default(fd, depth + 1, trace);
+		} else {
+			bt_list_for_each_entry(iter, &node->u.root.clock, siblings) {
+				ret = ctf_clock_visit(fd, depth + 1, iter,
+						      trace);
+				if (ret) {
+					fprintf(fd, "[error] %s: clock declaration error\n", __func__);
+					goto error;
 				}
 			}
-			env_clock_done = 1;
 		}
 		bt_list_for_each_entry(iter, &node->u.root.declaration_list,
 					siblings) {
@@ -2977,6 +3020,7 @@ retry:
 		bt_list_for_each_entry(iter, &node->u.root.trace, siblings) {
 			ret = ctf_trace_visit(fd, depth + 1, iter, trace);
 			if (ret == -EINTR) {
+				trace->restart_root_decl = 1;
 				bt_free_declaration_scope(trace->root_declaration_scope);
 				/*
 				 * Need to restart creation of type
@@ -2990,6 +3034,7 @@ retry:
 				goto error;
 			}
 		}
+		trace->restart_root_decl = 0;
 		bt_list_for_each_entry(iter, &node->u.root.callsite, siblings) {
 			ret = ctf_callsite_visit(fd, depth + 1, iter,
 					      trace);