X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=1e7fedd8d3319cae443e838c45a9e2f0e74a302e;hp=8556055e8ab2f5f1b921068e237a67ccee79a69b;hb=b1a2f5806630289aa0b85edbb7f7c581cfa26178;hpb=d11e9c4975d88591e2324b6b11f426a22995833f

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 8556055e..1e7fedd8 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -49,7 +49,8 @@ extern int yydebug;
 struct trace_descriptor *ctf_open_trace(const char *path, int flags);
 void ctf_close_trace(struct trace_descriptor *descriptor);
 
-static rw_dispatch read_dispatch_table[] = {
+static
+rw_dispatch read_dispatch_table[] = {
 	[ CTF_TYPE_INTEGER ] = ctf_integer_read,
 	[ CTF_TYPE_FLOAT ] = ctf_float_read,
 	[ CTF_TYPE_ENUM ] = ctf_enum_read,
@@ -60,7 +61,8 @@ static rw_dispatch read_dispatch_table[] = {
 	[ CTF_TYPE_SEQUENCE ] = ctf_sequence_rw,
 };
 
-static rw_dispatch write_dispatch_table[] = {
+static
+rw_dispatch write_dispatch_table[] = {
 	[ CTF_TYPE_INTEGER ] = ctf_integer_write,
 	[ CTF_TYPE_FLOAT ] = ctf_float_write,
 	[ CTF_TYPE_ENUM ] = ctf_enum_write,
@@ -71,12 +73,13 @@ static rw_dispatch write_dispatch_table[] = {
 	[ CTF_TYPE_SEQUENCE ] = ctf_sequence_rw,
 };
 
+static
 struct format ctf_format = {
 	.open_trace = ctf_open_trace,
 	.close_trace = ctf_close_trace,
 };
 
-void ctf_init_pos(struct ctf_stream_pos *pos, int fd)
+void ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags)
 {
 	pos->fd = fd;
 	pos->mmap_offset = 0;
@@ -86,29 +89,27 @@ void ctf_init_pos(struct ctf_stream_pos *pos, int fd)
 	pos->base = NULL;
 	pos->offset = 0;
 	pos->dummy = false;
-	pos->packet_index = g_array_new(FALSE, TRUE,
-					sizeof(struct packet_index));
 	pos->cur_index = 0;
-	if (fd >= 0) {
-		int flags = fcntl(fd, F_GETFL, 0);
-
-		switch (flags & O_ACCMODE) {
-		case O_RDONLY:
-			pos->prot = PROT_READ;
-			pos->flags = MAP_PRIVATE;
-			pos->parent.rw_table = read_dispatch_table;
-			break;
-		case O_WRONLY:
-		case O_RDWR:
-			pos->prot = PROT_WRITE;	/* Write has priority */
-			pos->flags = MAP_SHARED;
-			pos->parent.rw_table = write_dispatch_table;
-			ctf_move_pos_slow(pos, 0);	/* position for write */
-			break;
-		default:
-			assert(0);
-		}
-
+	if (fd >= 0)
+		pos->packet_index = g_array_new(FALSE, TRUE,
+						sizeof(struct packet_index));
+	else
+		pos->packet_index = NULL;
+	switch (open_flags & O_ACCMODE) {
+	case O_RDONLY:
+		pos->prot = PROT_READ;
+		pos->flags = MAP_PRIVATE;
+		pos->parent.rw_table = read_dispatch_table;
+		break;
+	case O_RDWR:
+		pos->prot = PROT_WRITE;	/* Write has priority */
+		pos->flags = MAP_SHARED;
+		pos->parent.rw_table = write_dispatch_table;
+		if (fd >= 0)
+			ctf_move_pos_slow(pos, 0, SEEK_SET);	/* position for write */
+		break;
+	default:
+		assert(0);
 	}
 }
 
@@ -130,13 +131,12 @@ void ctf_fini_pos(struct ctf_stream_pos *pos)
 	(void) g_array_free(pos->packet_index, TRUE);
 }
 
-void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset)
+void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence)
 {
 	int ret;
 	off_t off;
 	struct packet_index *index;
 
-
 	if (pos->prot == PROT_WRITE && pos->content_size_loc)
 		*pos->content_size_loc = pos->offset;
 
@@ -148,6 +148,7 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset)
 				strerror(errno));
 			assert(0);
 		}
+		pos->base = NULL;
 	}
 
 	/*
@@ -155,29 +156,43 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset)
 	 * except to get exactly at the beginning of the next packet.
 	 */
 	if (pos->prot == PROT_WRITE) {
-		/* The writer will add padding */
-		assert(pos->offset + offset == pos->packet_size);
-
-		/*
-		 * Don't increment for initial stream move (only condition where
-		 * pos->offset can be 0.
-		 */
-		if (pos->offset)
+		switch (whence) {
+		case SEEK_CUR:
+			/* The writer will add padding */
+			assert(pos->offset + offset == pos->packet_size);
 			pos->mmap_offset += WRITE_PACKET_LEN / CHAR_BIT;
+			break;
+		case SEEK_SET:
+			assert(offset == 0);	/* only seek supported for now */
+			pos->cur_index = 0;
+			break;
+		default:
+			assert(0);
+		}
 		pos->content_size = -1U;	/* Unknown at this point */
 		pos->packet_size = WRITE_PACKET_LEN;
-		off = posix_fallocate(pos->fd, pos->mmap_offset, pos->packet_size / CHAR_BIT);
+		off = posix_fallocate(pos->fd, pos->mmap_offset,
+				      pos->packet_size / CHAR_BIT);
 		assert(off >= 0);
+		pos->offset = 0;
 	} else {
-		/* The reader will expect us to skip padding */
-		assert(pos->offset + offset == pos->content_size);
-
-		/*
-		 * Don't increment for initial stream move (only condition where
-		 * pos->offset can be 0).
-		 */
-		if (pos->offset)
+		switch (whence) {
+		case SEEK_CUR:
+			/* The reader will expect us to skip padding */
+			assert(pos->offset + offset == pos->content_size);
 			++pos->cur_index;
+			break;
+		case SEEK_SET:
+			assert(offset == 0);	/* only seek supported for now */
+			pos->cur_index = 0;
+			break;
+		default:
+			assert(0);
+		}
+		if (pos->cur_index >= pos->packet_index->len) {
+			pos->offset = EOF;
+			return;
+		}
 		index = &g_array_index(pos->packet_index, struct packet_index,
 				       pos->cur_index);
 		pos->mmap_offset = index->offset;
@@ -185,11 +200,16 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset)
 		/* Lookup context/packet size in index */
 		pos->content_size = index->content_size;
 		pos->packet_size = index->packet_size;
+		pos->offset = index->data_offset;
 	}
 	/* map new base. Need mapping length from header. */
 	pos->base = mmap(NULL, pos->packet_size / CHAR_BIT, pos->prot,
 			 pos->flags, pos->fd, pos->mmap_offset);
-	pos->offset = 0;
+	if (pos->base == MAP_FAILED) {
+		fprintf(stdout, "[error] mmap error %s.\n",
+			strerror(errno));
+		assert(0);
+	}
 }
 
 /*
@@ -305,19 +325,20 @@ int create_stream_packet_index(struct ctf_trace *td,
 		/* read and check header, set stream id (and check) */
 		if (td->packet_header) {
 			/* Read packet header */
-			generic_rw(&pos->parent, &td->packet_header->p);
-
+			ret = generic_rw(&pos->parent, &td->packet_header->p);
+			if (ret)
+				return ret;
 			len_index = struct_declaration_lookup_field_index(td->packet_header->declaration, g_quark_from_static_string("magic"));
 			if (len_index >= 0) {
 				struct definition_integer *defint;
-				struct field *field;
+				struct definition *field;
 
 				field = struct_definition_get_field_from_index(td->packet_header, len_index);
-				assert(field->definition->declaration->id == CTF_TYPE_INTEGER);
-				defint = container_of(field->definition, struct definition_integer, p);
+				assert(field->declaration->id == CTF_TYPE_INTEGER);
+				defint = container_of(field, struct definition_integer, p);
 				assert(defint->declaration->signedness == FALSE);
 				if (defint->value._unsigned != CTF_MAGIC) {
-					fprintf(stdout, "[error] Invalid magic number %" PRIX64 " at packet %u (file offset %zd).\n",
+					fprintf(stdout, "[error] Invalid magic number 0x%" PRIX64 " at packet %u (file offset %zd).\n",
 							defint->value._unsigned,
 							file_stream->pos.packet_index->len,
 							(ssize_t) pos->mmap_offset);
@@ -329,13 +350,13 @@ int create_stream_packet_index(struct ctf_trace *td,
 			len_index = struct_declaration_lookup_field_index(td->packet_header->declaration, g_quark_from_static_string("trace_uuid"));
 			if (len_index >= 0) {
 				struct definition_array *defarray;
-				struct field *field;
+				struct definition *field;
 				uint64_t i;
 				uint8_t uuidval[UUID_LEN];
 
 				field = struct_definition_get_field_from_index(td->packet_header, len_index);
-				assert(field->definition->declaration->id == CTF_TYPE_ARRAY);
-				defarray = container_of(field->definition, struct definition_array, p);
+				assert(field->declaration->id == CTF_TYPE_ARRAY);
+				defarray = container_of(field, struct definition_array, p);
 				assert(array_len(defarray) == UUID_LEN);
 				assert(defarray->declaration->elem->id == CTF_TYPE_INTEGER);
 
@@ -359,11 +380,11 @@ int create_stream_packet_index(struct ctf_trace *td,
 			len_index = struct_declaration_lookup_field_index(td->packet_header->declaration, g_quark_from_static_string("stream_id"));
 			if (len_index >= 0) {
 				struct definition_integer *defint;
-				struct field *field;
+				struct definition *field;
 
 				field = struct_definition_get_field_from_index(td->packet_header, len_index);
-				assert(field->definition->declaration->id == CTF_TYPE_INTEGER);
-				defint = container_of(field->definition, struct definition_integer, p);
+				assert(field->declaration->id == CTF_TYPE_INTEGER);
+				defint = container_of(field, struct definition_integer, p);
 				assert(defint->declaration->signedness == FALSE);
 				stream_id = defint->value._unsigned;
 			}
@@ -390,17 +411,18 @@ int create_stream_packet_index(struct ctf_trace *td,
 
 		if (stream->packet_context) {
 			/* Read packet context */
-			generic_rw(&pos->parent, &stream->packet_context->p);
-
+			ret = generic_rw(&pos->parent, &stream->packet_context->p);
+			if (ret)
+				return ret;
 			/* read content size from header */
 			len_index = struct_declaration_lookup_field_index(stream->packet_context->declaration, g_quark_from_static_string("content_size"));
 			if (len_index >= 0) {
 				struct definition_integer *defint;
-				struct field *field;
+				struct definition *field;
 
 				field = struct_definition_get_field_from_index(stream->packet_context, len_index);
-				assert(field->definition->declaration->id == CTF_TYPE_INTEGER);
-				defint = container_of(field->definition, struct definition_integer, p);
+				assert(field->declaration->id == CTF_TYPE_INTEGER);
+				defint = container_of(field, struct definition_integer, p);
 				assert(defint->declaration->signedness == FALSE);
 				packet_index.content_size = defint->value._unsigned;
 			} else {
@@ -412,11 +434,11 @@ int create_stream_packet_index(struct ctf_trace *td,
 			len_index = struct_declaration_lookup_field_index(stream->packet_context->declaration, g_quark_from_static_string("packet_size"));
 			if (len_index >= 0) {
 				struct definition_integer *defint;
-				struct field *field;
+				struct definition *field;
 
 				field = struct_definition_get_field_from_index(stream->packet_context, len_index);
-				assert(field->definition->declaration->id == CTF_TYPE_INTEGER);
-				defint = container_of(field->definition, struct definition_integer, p);
+				assert(field->declaration->id == CTF_TYPE_INTEGER);
+				defint = container_of(field, struct definition_integer, p);
 				assert(defint->declaration->signedness == FALSE);
 				packet_index.packet_size = defint->value._unsigned;
 			} else {
@@ -430,12 +452,31 @@ int create_stream_packet_index(struct ctf_trace *td,
 			packet_index.packet_size = packet_index.content_size ? : filestats.st_size * CHAR_BIT;
 		}
 
+		/* Validate content size and packet size values */
+		if (packet_index.content_size > packet_index.packet_size) {
+			fprintf(stdout, "[error] Content size (%zu bits) is larger than packet size (%zu bits).\n",
+				packet_index.content_size, packet_index.packet_size);
+			return -EINVAL;
+		}
+
+		if (packet_index.packet_size > (filestats.st_size - packet_index.offset) * CHAR_BIT) {
+			fprintf(stdout, "[error] Packet size (%zu bits) is larger than remaining file size (%zu bits).\n",
+				packet_index.content_size, (filestats.st_size - packet_index.offset) * CHAR_BIT);
+			return -EINVAL;
+		}
+
+		/* Save position after header and context */
+		packet_index.data_offset = pos->offset;
+
 		/* add index to packet array */
 		g_array_append_val(file_stream->pos.packet_index, packet_index);
 
 		pos->mmap_offset += packet_index.packet_size / CHAR_BIT;
 	}
 
+	/* Move pos back to beginning of file */
+	ctf_move_pos_slow(pos, 0, SEEK_SET);	/* position for write */
+
 	return 0;
 }
 
@@ -453,7 +494,7 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags)
 	if (ret < 0)
 		goto error;
 	file_stream = g_new0(struct ctf_file_stream, 1);
-	ctf_init_pos(&file_stream->pos, ret);
+	ctf_init_pos(&file_stream->pos, ret, flags);
 	ret = create_stream_packet_index(td, file_stream);
 	if (ret)
 		goto error_index;
@@ -524,7 +565,8 @@ int ctf_open_trace_read(struct ctf_trace *td, const char *path, int flags)
 		}
 		if (!diriter)
 			break;
-		if (!strcmp(diriter->d_name, ".")
+		/* Ignore hidden files, ., .. and metadata. */
+		if (!strncmp(diriter->d_name, ".", 1)
 				|| !strcmp(diriter->d_name, "..")
 				|| !strcmp(diriter->d_name, "metadata"))
 			continue;
@@ -549,30 +591,6 @@ error:
 	return ret;
 }
 
-static
-int ctf_open_trace_write(struct ctf_trace *td, const char *path, int flags)
-{
-	int ret;
-
-	ret = mkdir(path, S_IRWXU|S_IRWXG);
-	if (ret)
-		return ret;
-
-	/* Open trace directory */
-	td->dir = opendir(path);
-	if (!td->dir) {
-		fprintf(stdout, "[error] Unable to open trace directory.\n");
-		ret = -ENOENT;
-		goto error;
-	}
-	
-
-	return 0;
-
-error:
-	return ret;
-}
-
 struct trace_descriptor *ctf_open_trace(const char *path, int flags)
 {
 	struct ctf_trace *td;
@@ -582,19 +600,17 @@ struct trace_descriptor *ctf_open_trace(const char *path, int flags)
 
 	switch (flags & O_ACCMODE) {
 	case O_RDONLY:
+		if (!path) {
+			fprintf(stdout, "[error] Path missing for input CTF trace.\n");
+			goto error;
+		}
 		ret = ctf_open_trace_read(td, path, flags);
 		if (ret)
 			goto error;
 		break;
-	case O_WRONLY:
+	case O_RDWR:
 		fprintf(stdout, "[error] Opening CTF traces for output is not supported yet.\n");
 		goto error;
-#if 0
-		ret = ctf_open_trace_write(td, path, flags);
-		if (ret)
-			goto error;
-#endif //0
-		break;
 	default:
 		fprintf(stdout, "[error] Incorrect open flags.\n");
 		goto error;
@@ -622,11 +638,10 @@ void ctf_close_trace(struct trace_descriptor *tdp)
 		for (i = 0; i < td->streams->len; i++) {
 			struct ctf_stream *stream;
 			int j;
-
 			stream = g_ptr_array_index(td->streams, i);
 			for (j = 0; j < stream->files->len; j++) {
 				struct ctf_file_stream *file_stream;
-				file_stream = g_ptr_array_index(td->streams, j);
+				file_stream = g_ptr_array_index(stream->files, j);
 				ctf_close_file_stream(file_stream);
 			}