From 0d08ed29311a9f1381b2015fd609dd10fdcf284a Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 13 Oct 2015 12:06:26 -0400 Subject: [PATCH] Fix: babeltrace-log packet seek MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Jérémie Galarneau --- converter/babeltrace-log.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c index 5a8b26a8..c6f751ea 100644 --- 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 (;;) { -- 2.34.1