X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=f4432a89d167c0fe01e181232f246ad4cf5b73e0;hp=08834e9744318e944ae97ad006c43f8ca79b8bb0;hb=764af3f43c289a0a5cd8bf6fd85d9361ae17a253;hpb=b61922b5e7b4d7ec5ed960c3d842886b5a97f549

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 08834e97..f4432a89 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -79,6 +79,162 @@ struct format ctf_format = {
 	.close_trace = ctf_close_trace,
 };
 
+static
+int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
+{
+	struct ctf_stream_pos *pos =
+		container_of(ppos, struct ctf_stream_pos, parent);
+	struct ctf_stream_class *stream_class = stream->stream_class;
+	struct ctf_event *event_class;
+	uint64_t id = 0;
+	int len_index;
+	int ret;
+
+	if (pos->offset == EOF)
+		return EOF;
+
+	/* Read event header */
+	if (stream_class->event_header) {
+		ret = generic_rw(ppos, &stream_class->event_header->p);
+		if (ret)
+			goto error;
+		/* lookup event id */
+		len_index = struct_declaration_lookup_field_index(stream_class->event_header_decl,
+				g_quark_from_static_string("id"));
+		if (len_index >= 0) {
+			struct definition_integer *defint;
+			struct definition *field;
+
+			field = struct_definition_get_field_from_index(stream_class->event_header, len_index);
+			assert(field->declaration->id == CTF_TYPE_INTEGER);
+			defint = container_of(field, struct definition_integer, p);
+			assert(defint->declaration->signedness == FALSE);
+			id = defint->value._unsigned;	/* set id */
+		}
+
+		/* lookup timestamp */
+		len_index = struct_declaration_lookup_field_index(stream_class->event_header_decl,
+				g_quark_from_static_string("timestamp"));
+		if (len_index >= 0) {
+			struct definition_integer *defint;
+			struct definition *field;
+
+			field = struct_definition_get_field_from_index(stream_class->event_header, len_index);
+			assert(field->declaration->id == CTF_TYPE_INTEGER);
+			defint = container_of(field, struct definition_integer, p);
+			assert(defint->declaration->signedness == FALSE);
+			/* update timestamp */
+			stream->timestamp = defint->value._unsigned;
+		}
+
+	}
+
+	/* Read stream-declared event context */
+	if (stream_class->event_context) {
+		ret = generic_rw(ppos, &stream_class->event_context->p);
+		if (ret)
+			goto error;
+	}
+
+	if (id >= stream_class->events_by_id->len) {
+		fprintf(stdout, "[error] Event id %" PRIu64 " is outside range.\n", id);
+		return -EINVAL;
+	}
+	event_class = g_ptr_array_index(stream_class->events_by_id, id);
+	if (!event_class) {
+		fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id);
+		return -EINVAL;
+	}
+
+	/* Read event-declared event context */
+	if (event_class->context) {
+		ret = generic_rw(ppos, &event_class->context->p);
+		if (ret)
+			goto error;
+	}
+
+	/* Read event payload */
+	if (event_class->fields) {
+		ret = generic_rw(ppos, &event_class->fields->p);
+		if (ret)
+			goto error;
+	}
+
+	return 0;
+
+error:
+	fprintf(stdout, "[error] Unexpected end of stream. Either the trace data stream is corrupted or metadata description does not match data layout.\n");
+	return ret;
+}
+
+static
+int ctf_write_event(struct stream_pos *pos, struct ctf_stream *stream)
+{
+	struct ctf_stream_class *stream_class = stream->stream_class;
+	struct ctf_event *event_class;
+	uint64_t id = 0;
+	int len_index;
+	int ret;
+
+	/* print event header */
+	if (stream_class->event_header) {
+		/* lookup event id */
+		len_index = struct_declaration_lookup_field_index(stream_class->event_header_decl,
+				g_quark_from_static_string("id"));
+		if (len_index >= 0) {
+			struct definition_integer *defint;
+			struct definition *field;
+
+			field = struct_definition_get_field_from_index(stream_class->event_header, len_index);
+			assert(field->declaration->id == CTF_TYPE_INTEGER);
+			defint = container_of(field, struct definition_integer, p);
+			assert(defint->declaration->signedness == FALSE);
+			id = defint->value._unsigned;	/* set id */
+		}
+
+		ret = generic_rw(pos, &stream_class->event_header->p);
+		if (ret)
+			goto error;
+	}
+
+	/* print stream-declared event context */
+	if (stream_class->event_context) {
+		ret = generic_rw(pos, &stream_class->event_context->p);
+		if (ret)
+			goto error;
+	}
+
+	if (id >= stream_class->events_by_id->len) {
+		fprintf(stdout, "[error] Event id %" PRIu64 " is outside range.\n", id);
+		return -EINVAL;
+	}
+	event_class = g_ptr_array_index(stream_class->events_by_id, id);
+	if (!event_class) {
+		fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id);
+		return -EINVAL;
+	}
+
+	/* print event-declared event context */
+	if (event_class->context) {
+		ret = generic_rw(pos, &event_class->context->p);
+		if (ret)
+			goto error;
+	}
+
+	/* Read and print event payload */
+	if (event_class->fields) {
+		ret = generic_rw(pos, &event_class->fields->p);
+		if (ret)
+			goto error;
+	}
+
+	return 0;
+
+error:
+	fprintf(stdout, "[error] Unexpected end of stream. Either the trace data stream is corrupted or metadata description does not match data layout.\n");
+	return ret;
+}
+
 void ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags)
 {
 	pos->fd = fd;
@@ -100,12 +256,13 @@ void ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags)
 		pos->prot = PROT_READ;
 		pos->flags = MAP_PRIVATE;
 		pos->parent.rw_table = read_dispatch_table;
+		pos->parent.event_cb = ctf_read_event;
 		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;
+		pos->parent.event_cb = ctf_write_event;
 		if (fd >= 0)
 			ctf_move_pos_slow(pos, 0, SEEK_SET);	/* position for write */
 		break;
@@ -138,9 +295,6 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence)
 	off_t off;
 	struct packet_index *index;
 
-	/* Only allow random seek in read mode */
-	assert(pos->prot != PROT_WRITE || whence == SEEK_CUR);
-
 	if (pos->prot == PROT_WRITE && pos->content_size_loc)
 		*pos->content_size_loc = pos->offset;
 
@@ -160,18 +314,23 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence)
 	 * 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 {
@@ -189,7 +348,7 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence)
 			assert(0);
 		}
 		if (pos->cur_index >= pos->packet_index->len) {
-			pos->offset = -EOF;
+			pos->offset = EOF;
 			return;
 		}
 		index = &g_array_index(pos->packet_index, struct packet_index,
@@ -283,7 +442,7 @@ static
 int create_stream_packet_index(struct ctf_trace *td,
 			       struct ctf_file_stream *file_stream)
 {
-	struct ctf_stream *stream;
+	struct ctf_stream_class *stream;
 	int len_index;
 	struct ctf_stream_pos *pos;
 	struct stat filestats;
@@ -324,19 +483,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);
@@ -348,13 +508,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);
 
@@ -378,11 +538,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;
 			}
@@ -403,23 +563,24 @@ int create_stream_packet_index(struct ctf_trace *td,
 				fprintf(stdout, "[error] Stream %" PRIu64 " is not declared in metadata.\n", stream_id);
 				return -EINVAL;
 			}
-			file_stream->stream = stream;
+			file_stream->stream.stream_class = stream;
 		}
 		first_packet = 0;
 
 		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 {
@@ -431,11 +592,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 {
@@ -448,6 +609,20 @@ int create_stream_packet_index(struct ctf_trace *td,
 			/* Use content size if non-zero, else file size */
 			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;
 
@@ -482,7 +657,7 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags)
 	if (ret)
 		goto error_index;
 	/* Add stream file to stream class */
-	g_ptr_array_add(file_stream->stream->files, file_stream);
+	g_ptr_array_add(file_stream->stream.stream_class->files, file_stream);
 	return 0;
 
 error_index:
@@ -548,7 +723,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;
@@ -590,7 +766,7 @@ struct trace_descriptor *ctf_open_trace(const char *path, int 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;
 	default:
@@ -618,7 +794,7 @@ void ctf_close_trace(struct trace_descriptor *tdp)
 
 	if (td->streams) {
 		for (i = 0; i < td->streams->len; i++) {
-			struct ctf_stream *stream;
+			struct ctf_stream_class *stream;
 			int j;
 			stream = g_ptr_array_index(td->streams, i);
 			for (j = 0; j < stream->files->len; j++) {