X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=5dce5f5a5dcb0c3033a1179a5acccdbcfa8542fe;hb=889aa6c01b16ee877ca221ed64c79457d01d51c4;hp=07966632e82caa99139f20458faf7f3d99f87449;hpb=4c4ba0211b25f7a4ef4f3fbd7cda9ee5a4bc6330;p=babeltrace.git

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 07966632..5dce5f5a 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -147,6 +147,8 @@ uint64_t ctf_timestamp_begin(struct trace_descriptor *descriptor,
 		struct ctf_stream_declaration *stream_class;
 
 		stream_class = g_ptr_array_index(tin->streams, i);
+		if (!stream_class)
+			continue;
 		/* for each file_stream */
 		for (j = 0; j < stream_class->streams->len; j++) {
 			struct ctf_stream_definition *stream;
@@ -190,6 +192,8 @@ uint64_t ctf_timestamp_end(struct trace_descriptor *descriptor,
 		struct ctf_stream_declaration *stream_class;
 
 		stream_class = g_ptr_array_index(tin->streams, i);
+		if (!stream_class)
+			continue;
 		/* for each file_stream */
 		for (j = 0; j < stream_class->streams->len; j++) {
 			struct ctf_stream_definition *stream;
@@ -491,7 +495,7 @@ void ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags)
 	pos->packet_size = 0;
 	pos->content_size = 0;
 	pos->content_size_loc = NULL;
-	pos->base = NULL;
+	pos->base_mma = NULL;
 	pos->offset = 0;
 	pos->dummy = false;
 	pos->cur_index = 0;
@@ -526,9 +530,9 @@ void ctf_fini_pos(struct ctf_stream_pos *pos)
 
 	if (pos->prot == PROT_WRITE && pos->content_size_loc)
 		*pos->content_size_loc = pos->offset;
-	if (pos->base) {
+	if (pos->base_mma) {
 		/* unmap old base */
-		ret = munmap(pos->base, pos->packet_size / CHAR_BIT);
+		ret = munmap_align(pos->base_mma);
 		if (ret) {
 			fprintf(stderr, "[error] Unable to unmap old base: %s.\n",
 				strerror(errno));
@@ -555,15 +559,15 @@ void ctf_packet_seek(struct stream_pos *stream_pos, size_t index, int whence)
 	if (pos->prot == PROT_WRITE && pos->content_size_loc)
 		*pos->content_size_loc = pos->offset;
 
-	if (pos->base) {
+	if (pos->base_mma) {
 		/* unmap old base */
-		ret = munmap(pos->base, pos->packet_size / CHAR_BIT);
+		ret = munmap_align(pos->base_mma);
 		if (ret) {
 			fprintf(stderr, "[error] Unable to unmap old base: %s.\n",
 				strerror(errno));
 			assert(0);
 		}
-		pos->base = NULL;
+		pos->base_mma = NULL;
 	}
 
 	/*
@@ -686,9 +690,9 @@ void ctf_packet_seek(struct stream_pos *stream_pos, size_t index, int whence)
 		}
 	}
 	/* 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);
-	if (pos->base == MAP_FAILED) {
+	pos->base_mma = mmap_align(pos->packet_size / CHAR_BIT, pos->prot,
+			pos->flags, pos->fd, pos->mmap_offset);
+	if (pos->base_mma == MAP_FAILED) {
 		fprintf(stderr, "[error] mmap error %s.\n",
 			strerror(errno));
 		assert(0);
@@ -1145,19 +1149,20 @@ int create_stream_packet_index(struct ctf_trace *td,
 	for (pos->mmap_offset = 0; pos->mmap_offset < filestats.st_size; ) {
 		uint64_t stream_id = 0;
 
-		if (pos->base) {
+		if (pos->base_mma) {
 			/* unmap old base */
-			ret = munmap(pos->base, pos->packet_size / CHAR_BIT);
+			ret = munmap_align(pos->base_mma);
 			if (ret) {
 				fprintf(stderr, "[error] Unable to unmap old base: %s.\n",
 					strerror(errno));
 				return ret;
 			}
-			pos->base = NULL;
+			pos->base_mma = NULL;
 		}
 		/* map new base. Need mapping length from header. */
-		pos->base = mmap(NULL, MAX_PACKET_HEADER_LEN / CHAR_BIT, PROT_READ,
+		pos->base_mma = mmap_align(MAX_PACKET_HEADER_LEN / CHAR_BIT, PROT_READ,
 				 MAP_PRIVATE, pos->fd, pos->mmap_offset);
+		assert(pos->base_mma != MAP_FAILED);
 		pos->content_size = MAX_PACKET_HEADER_LEN;	/* Unknown at this point */
 		pos->packet_size = MAX_PACKET_HEADER_LEN;	/* Unknown at this point */
 		pos->offset = 0;	/* Position of the packet header */
@@ -1321,7 +1326,7 @@ int create_stream_packet_index(struct ctf_trace *td,
 
 		if (packet_index.packet_size > ((uint64_t)filestats.st_size - packet_index.offset) * CHAR_BIT) {
 			fprintf(stderr, "[error] Packet size (%" PRIu64 " bits) is larger than remaining file size (%" PRIu64 " bits).\n",
-				packet_index.content_size, ((uint64_t)filestats.st_size - packet_index.offset) * CHAR_BIT);
+				packet_index.packet_size, ((uint64_t)filestats.st_size - packet_index.offset) * CHAR_BIT);
 			return -EINVAL;
 		}
 
@@ -1553,7 +1558,7 @@ void ctf_init_mmap_pos(struct ctf_stream_pos *pos,
 	pos->content_size = 0;
 	pos->content_size_loc = NULL;
 	pos->fd = mmap_info->fd;
-	pos->base = 0;
+	pos->base_mma = NULL;
 	pos->offset = 0;
 	pos->dummy = false;
 	pos->cur_index = 0;