X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=f078735c3ea9fd5307c46333b28b2c473867a7e1;hp=2b2e15185275b68699467ea62f07aa8ef35bca1b;hb=5f643ed7d0d2d21d3797938e34735ef8f1bd9186;hpb=64fa3fec6c28f1d077812b4bfa06ae73b0f5999d

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 2b2e1518..f078735c 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -125,8 +125,11 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
 	uint64_t id = 0;
 	int ret;
 
+	ctf_pos_get_event(pos);
+
 	if (pos->offset == EOF)
 		return EOF;
+	assert(pos->offset < pos->content_size);
 
 	/* Read event header */
 	if (stream->stream_event_header) {
@@ -390,8 +393,11 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence)
 		assert(off >= 0);
 		pos->offset = 0;
 	} else {
+	read_next_packet:
 		switch (whence) {
 		case SEEK_CUR:
+			if (pos->offset == EOF)
+				return;
 			/* The reader will expect us to skip padding */
 			assert(pos->offset + offset == pos->content_size);
 			++pos->cur_index;
@@ -415,9 +421,14 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence)
 		file_stream->parent.timestamp = index->timestamp_begin;
 		pos->content_size = index->content_size;
 		pos->packet_size = index->packet_size;
-		if (index->data_offset < index->content_size)
+		if (index->data_offset < index->content_size) {
 			pos->offset = 0;	/* will read headers */
-		else {
+		} else if (index->data_offset == index->content_size) {
+			/* empty packet */
+			pos->offset = index->data_offset;
+			offset = 0;
+			goto read_next_packet;
+		} else {
 			pos->offset = EOF;
 			return;
 		}
@@ -458,24 +469,51 @@ int packet_metadata(struct ctf_trace *td, FILE *fp)
 	if (magic == TSDL_MAGIC) {
 		ret = 1;
 		td->byte_order = BYTE_ORDER;
+		CTF_TRACE_SET_FIELD(td, byte_order);
 	} else if (magic == GUINT32_SWAP_LE_BE(TSDL_MAGIC)) {
 		ret = 1;
 		td->byte_order = (BYTE_ORDER == BIG_ENDIAN) ?
 					LITTLE_ENDIAN : BIG_ENDIAN;
+		CTF_TRACE_SET_FIELD(td, byte_order);
 	}
-	CTF_TRACE_SET_FIELD(td, byte_order);
 end:
 	rewind(fp);
 	return ret;
 }
 
+/*
+ * Returns 0 on success, -1 on error.
+ */
+static
+int check_version(unsigned int major, unsigned int minor)
+{
+	switch (major) {
+	case 1:
+		switch (minor) {
+		case 8:
+			return 0;
+		default:
+			goto warning;
+		}
+	default:
+		goto warning;
+		
+	}
+
+	/* eventually return an error instead of warning */
+warning:
+	fprintf(stdout, "[warning] Unsupported CTF specification version %u.%u. Trying anyway.\n",
+		major, minor);
+	return 0;
+}
+
 static
 int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in,
 					FILE *out)
 {
 	struct metadata_packet_header header;
 	size_t readlen, writelen, toread;
-	char buf[4096];
+	char buf[4096 + 1];	/* + 1 for debug-mode \0 */
 	int ret = 0;
 
 	readlen = fread(&header, header_sizeof(header), 1, in);
@@ -505,6 +543,8 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in,
 			header.checksum_scheme);
 		return -EINVAL;
 	}
+	if (check_version(header.major, header.minor) < 0)
+		return -EINVAL;
 	if (!CTF_TRACE_FIELD_IS_SET(td, uuid)) {
 		memcpy(td->uuid, header.uuid, sizeof(header.uuid));
 		CTF_TRACE_SET_FIELD(td, uuid);
@@ -516,12 +556,13 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in,
 	toread = (header.content_size / CHAR_BIT) - header_sizeof(header);
 
 	for (;;) {
-		readlen = fread(buf, sizeof(char), min(sizeof(buf), toread), in);
+		readlen = fread(buf, sizeof(char), min(sizeof(buf) - 1, toread), in);
 		if (ferror(in)) {
 			ret = -EINVAL;
 			break;
 		}
 		if (babeltrace_debug) {
+			buf[readlen] = '\0';
 			fprintf(stdout, "[debug] metadata packet read: %s\n",
 				buf);
 		}
@@ -538,10 +579,19 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in,
 		toread -= readlen;
 		if (!toread) {
 			ret = 0;	/* continue reading next packet */
-			break;
+			goto read_padding;
 		}
 	}
 	return ret;
+
+read_padding:
+	toread = (header.packet_size - header.content_size) / CHAR_BIT;
+	ret = fseek(in, toread, SEEK_CUR);
+	if (ret < 0) {
+		fprintf(stdout, "[warning] Missing padding at end of file\n");
+		ret = 0;
+	}
+	return ret;
 }
 
 static
@@ -610,6 +660,21 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td)
 		ret = ctf_open_trace_metadata_stream_read(td, &fp, &buf);
 		if (ret)
 			goto end_packet_read;
+	} else {
+		unsigned int major, minor;
+		ssize_t nr_items;
+
+		td->byte_order = BYTE_ORDER;
+
+		/* Check text-only metadata header and version */
+		nr_items = fscanf(fp, "/* CTF %u.%u", &major, &minor);
+		if (nr_items < 2)
+			fprintf(stdout, "[warning] Ill-shapen or missing \"/* CTF x.y\" header for text-only metadata.\n");
+		if (check_version(major, minor) < 0) {
+			ret = -EINVAL;
+			goto end_packet_read;
+		}
+		rewind(fp);
 	}
 
 	scanner = ctf_scanner_alloc(fp);
@@ -638,7 +703,7 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td)
 		goto end;
 	}
 	ret = ctf_visitor_construct_metadata(stdout, 0, &scanner->ast->root,
-			td, BYTE_ORDER);
+			td, td->byte_order);
 	if (ret) {
 		fprintf(stdout, "[error] Error in CTF metadata constructor %d\n", ret);
 		goto end;
@@ -907,13 +972,12 @@ int create_stream_packet_index(struct ctf_trace *td,
 				return -EINVAL;
 			}
 			file_stream->parent.stream_class = stream;
+			ret = create_stream_definitions(td, &file_stream->parent);
+			if (ret)
+				return ret;
 		}
 		first_packet = 0;
 
-		ret = create_stream_definitions(td, &file_stream->parent);
-		if (ret)
-			return ret;
-
 		if (file_stream->parent.stream_packet_context) {
 			/* Read packet context */
 			ret = generic_rw(&pos->parent, &file_stream->parent.stream_packet_context->p);