X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=formats%2Fctf%2Fctf.c;h=1e7fedd8d3319cae443e838c45a9e2f0e74a302e;hb=b1a2f5806630289aa0b85edbb7f7c581cfa26178;hp=a418a6d507d4f1f33051495bdd3c95ada513f5ae;hpb=58b0b8835f84f2a028328e02eb5044640880d1e5;p=babeltrace.git

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index a418a6d5..1e7fedd8 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -101,7 +101,6 @@ void ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags)
 		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;
@@ -138,9 +137,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 +156,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 +190,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,
@@ -330,14 +331,14 @@ 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("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);
@@ -349,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);
 
@@ -379,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;
 			}
@@ -417,11 +418,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("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 {
@@ -433,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 {
@@ -564,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;
@@ -606,7 +608,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: