From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 26 Jul 2011 00:09:06 +0000 (-0400)
Subject: Handle correctly cross-endianness for text-based metadata
X-Git-Tag: v0.3~18
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=fdce39de38b04770cc25bdf52a60bda7ef24c18b

Handle correctly cross-endianness for text-based metadata

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

diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
index fcb73838..bba15b68 100644
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -1898,9 +1898,17 @@ int ctf_trace_declaration_visit(FILE *fd, int depth, struct ctf_node *node, stru
 				ret = -EPERM;
 				goto error;
 			} else {
-				trace->byte_order = byte_order;
+				CTF_TRACE_SET_FIELD(trace, byte_order);
+				if (byte_order != trace->byte_order) {
+					trace->byte_order = byte_order;
+					/*
+					 * We need to restart
+					 * construction of the
+					 * intermediate representation.
+					 */
+					return -EINTR;
+				}
 			}
-			CTF_TRACE_SET_FIELD(trace, byte_order);
 		} else if (!strcmp(left, "packet.header")) {
 			struct declaration *declaration;
 
@@ -1946,6 +1954,7 @@ int ctf_trace_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace
 	int ret = 0;
 	struct ctf_node *iter;
 
+restart:
 	if (trace->declaration_scope)
 		return -EEXIST;
 	trace->declaration_scope = new_declaration_scope(trace->root_declaration_scope);
@@ -1992,6 +2001,10 @@ error:
 		declaration_unref(&trace->packet_header_decl->p);
 	g_ptr_array_free(trace->streams, TRUE);
 	free_declaration_scope(trace->declaration_scope);
+	trace->declaration_scope = NULL;
+	/* byte order changed while creating types, retry. */
+	if (ret == -EINTR)
+		goto restart;
 	return ret;
 }