X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace-log.c;h=bdb01f16f4b6e7d18f2f642ba3c3c5224072177a;hp=b6d798f797d0f86094b69c3e507dbf045ebed60f;hb=f77968f52cf4e04d08683a5f703c84dbaafb2d75;hpb=92c6a024cd3e81293bd39fd2b322e12ce57ea502

diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c
index b6d798f7..bdb01f16 100644
--- a/converter/babeltrace-log.c
+++ b/converter/babeltrace-log.c
@@ -28,13 +28,11 @@
  * Depends on glibc 2.10 for getline().
  */
 
-#define _GNU_SOURCE
-#include <config.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/mman.h>
-#include <dirent.h>
+#include <babeltrace/compat/dirent.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -108,7 +106,7 @@ void print_metadata(FILE *fp)
 	ret = sscanf(VERSION, "%u.%u", &major, &minor);
 	if (ret != 2)
 		fprintf(stderr, "[warning] Incorrect babeltrace version format\n.");
-	babeltrace_uuid_unparse(s_uuid, uuid_str);
+	bt_uuid_unparse(s_uuid, uuid_str);
 	fprintf(fp, metadata_fmt,
 		major,
 		minor,
@@ -124,23 +122,36 @@ void write_packet_header(struct ctf_stream_pos *pos, unsigned char *uuid)
 
 	/* magic */
 	ctf_dummy_pos(pos, &dummy);
-	ctf_align_pos(&dummy, sizeof(uint32_t) * CHAR_BIT);
-	ctf_move_pos(&dummy, sizeof(uint32_t) * CHAR_BIT);
+	if (!ctf_align_pos(&dummy, sizeof(uint32_t) * CHAR_BIT))
+		goto error;
+	if (!ctf_move_pos(&dummy, sizeof(uint32_t) * CHAR_BIT))
+		goto error;
 	assert(!ctf_pos_packet(&dummy));
 
-	ctf_align_pos(pos, sizeof(uint32_t) * CHAR_BIT);
+	if (!ctf_align_pos(pos, sizeof(uint32_t) * CHAR_BIT))
+		goto error;
 	*(uint32_t *) ctf_get_pos_addr(pos) = 0xC1FC1FC1;
-	ctf_move_pos(pos, sizeof(uint32_t) * CHAR_BIT);
+	if (!ctf_move_pos(pos, sizeof(uint32_t) * CHAR_BIT))
+		goto error;
 
 	/* uuid */
 	ctf_dummy_pos(pos, &dummy);
-	ctf_align_pos(&dummy, sizeof(uint8_t) * CHAR_BIT);
-	ctf_move_pos(&dummy, 16 * CHAR_BIT);
+	if (!ctf_align_pos(&dummy, sizeof(uint8_t) * CHAR_BIT))
+		goto error;
+	if (!ctf_move_pos(&dummy, 16 * CHAR_BIT))
+		goto error;
 	assert(!ctf_pos_packet(&dummy));
 
-	ctf_align_pos(pos, sizeof(uint8_t) * CHAR_BIT);
+	if (!ctf_align_pos(pos, sizeof(uint8_t) * CHAR_BIT))
+		goto error;
 	memcpy(ctf_get_pos_addr(pos), uuid, BABELTRACE_UUID_LEN);
-	ctf_move_pos(pos, BABELTRACE_UUID_LEN * CHAR_BIT);
+	if (!ctf_move_pos(pos, BABELTRACE_UUID_LEN * CHAR_BIT))
+		goto error;
+	return;
+
+error:
+	fprintf(stderr, "[error] Out of packet bounds when writing packet header\n");
+	abort();
 }
 
 static
@@ -150,24 +161,37 @@ void write_packet_context(struct ctf_stream_pos *pos)
 
 	/* content_size */
 	ctf_dummy_pos(pos, &dummy);
-	ctf_align_pos(&dummy, sizeof(uint64_t) * CHAR_BIT);
-	ctf_move_pos(&dummy, sizeof(uint64_t) * CHAR_BIT);
+	if (!ctf_align_pos(&dummy, sizeof(uint64_t) * CHAR_BIT))
+		goto error;
+	if (!ctf_move_pos(&dummy, sizeof(uint64_t) * CHAR_BIT))
+		goto error;
 	assert(!ctf_pos_packet(&dummy));
 
-	ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT);
+	if (!ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT))
+		goto error;
 	*(uint64_t *) ctf_get_pos_addr(pos) = ~0ULL;	/* Not known yet */
 	pos->content_size_loc = (uint64_t *) ctf_get_pos_addr(pos);
-	ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT);
+	if (!ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT))
+		goto error;
 
 	/* packet_size */
 	ctf_dummy_pos(pos, &dummy);
-	ctf_align_pos(&dummy, sizeof(uint64_t) * CHAR_BIT);
-	ctf_move_pos(&dummy, sizeof(uint64_t) * CHAR_BIT);
+	if (!ctf_align_pos(&dummy, sizeof(uint64_t) * CHAR_BIT))
+		goto error;
+	if (!ctf_move_pos(&dummy, sizeof(uint64_t) * CHAR_BIT))
+		goto error;
 	assert(!ctf_pos_packet(&dummy));
 
-	ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT);
+	if (!ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT))
+		goto error;
 	*(uint64_t *) ctf_get_pos_addr(pos) = pos->packet_size;
-	ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT);
+	if (!ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT))
+		goto error;
+	return;
+
+error:
+	fprintf(stderr, "[error] Out of packet bounds when writing packet context\n");
+	abort();
 }
 
 static
@@ -225,10 +249,17 @@ void write_event_header(struct ctf_stream_pos *pos, char *line,
 		}
 	}
 	/* timestamp */
-	ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT);
+	if (!ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT))
+		goto error;
 	if (!pos->dummy)
 		*(uint64_t *) ctf_get_pos_addr(pos) = *ts;
-	ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT);
+	if (!ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT))
+		goto error;
+	return;
+
+error:
+	fprintf(stderr, "[error] Out of packet bounds when writing event header\n");
+	abort();
 }
 
 static
@@ -243,11 +274,15 @@ void trace_string(char *line, struct ctf_stream_pos *pos, size_t len)
 	printf_debug("read: %s\n", line);
 
 	for (;;) {
+		int packet_filled = 0;
+
 		ctf_dummy_pos(pos, &dummy);
 		write_event_header(&dummy, line, &tline, len, &tlen, &ts);
-		ctf_align_pos(&dummy, sizeof(uint8_t) * CHAR_BIT);
-		ctf_move_pos(&dummy, tlen * CHAR_BIT);
-		if (ctf_pos_packet(&dummy)) {
+		if (!ctf_align_pos(&dummy, sizeof(uint8_t) * CHAR_BIT))
+			packet_filled = 1;
+		if (!ctf_move_pos(&dummy, tlen * CHAR_BIT))
+			packet_filled = 1;
+		if (packet_filled || ctf_pos_packet(&dummy)) {
 			ctf_pos_pad_packet(pos);
 			write_packet_header(pos, s_uuid);
 			write_packet_context(pos);
@@ -263,9 +298,16 @@ void trace_string(char *line, struct ctf_stream_pos *pos, size_t len)
 	}
 
 	write_event_header(pos, line, &tline, len, &tlen, &ts);
-	ctf_align_pos(pos, sizeof(uint8_t) * CHAR_BIT);
+	if (!ctf_align_pos(pos, sizeof(uint8_t) * CHAR_BIT))
+		goto error;
 	memcpy(ctf_get_pos_addr(pos), tline, tlen);
-	ctf_move_pos(pos, tlen * CHAR_BIT);
+	if (!ctf_move_pos(pos, tlen * CHAR_BIT))
+		goto error;
+	return;
+
+error:
+	fprintf(stderr, "[error] Out of packet bounds when writing event payload\n");
+	abort();
 }
 
 static
@@ -274,7 +316,7 @@ void trace_text(FILE *input, int output)
 	struct ctf_stream_pos pos;
 	ssize_t len;
 	char *line = NULL, *nl;
-	size_t linesize;
+	size_t linesize = 0;
 	int ret;
 
 	memset(&pos, 0, sizeof(pos));
@@ -283,6 +325,7 @@ void trace_text(FILE *input, int output)
 		fprintf(stderr, "Error in ctf_init_pos\n");
 		return;
 	}
+	ctf_packet_seek(&pos.parent, 0, SEEK_CUR);
 	write_packet_header(&pos, s_uuid);
 	write_packet_context(&pos);
 	for (;;) {
@@ -370,7 +413,7 @@ int main(int argc, char **argv)
 		perror("opendir");
 		goto error_rmdir;
 	}
-	dir_fd = dirfd(dir);
+	dir_fd = bt_dirfd(dir);
 	if (dir_fd < 0) {
 		perror("dirfd");
 		goto error_closedir;
@@ -395,7 +438,7 @@ int main(int argc, char **argv)
 		goto error_closemetadatafd;
 	}
 
-	babeltrace_uuid_generate(s_uuid);
+	bt_uuid_generate(s_uuid);
 	print_metadata(metadata_fp);
 	trace_text(stdin, fd);