Fix: babeltrace-log packet seek

Packet seek has been removed from ctf helper headers somewhere around
Babeltrace 1.1. Since then, babeltrace-log is broken when it needs to
output a file larger than the fixed-sized packet (WRITE_PACKET_LEN
currently defined as (getpagesize() * 8 * CHAR_BIT).

Correctly handle the non-zero return values on ctf_align_pos() and
ctf_move_pos() on the dummy position copy, which are used to validate
whether we need to switch packet or not. Also add an initial packet seek
at the beginning of the file.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c
index 5a8b26a8076ec4c26cdbdf3390403cf61b6f3e0f..c6f751ea4d97b7353dd44341608ba1377a7007e9 100644 (file)
--- a/converter/babeltrace-log.c
+++ b/converter/babeltrace-log.c
@@ -276,13 +276,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);
                if (!ctf_align_pos(&dummy, sizeof(uint8_t) * CHAR_BIT))
-                       goto error;
+                       packet_filled = 1;
                if (!ctf_move_pos(&dummy, tlen * CHAR_BIT))
-                       goto error;
-               if (ctf_pos_packet(&dummy)) {
+                       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);
@@ -325,6 +327,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 (;;) {