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>
printf_debug("read: %s\n", line);
for (;;) {
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))
ctf_dummy_pos(pos, &dummy);
write_event_header(&dummy, line, &tline, len, &tlen, &ts);
if (!ctf_align_pos(&dummy, sizeof(uint8_t) * CHAR_BIT))
if (!ctf_move_pos(&dummy, tlen * CHAR_BIT))
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);
ctf_pos_pad_packet(pos);
write_packet_header(pos, s_uuid);
write_packet_context(pos);
fprintf(stderr, "Error in ctf_init_pos\n");
return;
}
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 (;;) {
write_packet_header(&pos, s_uuid);
write_packet_context(&pos);
for (;;) {