tap-driver.sh: flush stdout after each test result

[babeltrace.git] / plugins / ctf / fs-sink / fs-sink-stream.c

diff --git a/plugins/ctf/fs-sink/fs-sink-stream.c b/plugins/ctf/fs-sink/fs-sink-stream.c
index 6e926def2241f9e459bb34146077502c60ef2c81..edf8dd034c1da73d9ee055d2ef6f83f59747d657 100644 (file)
--- a/plugins/ctf/fs-sink/fs-sink-stream.c
+++ b/plugins/ctf/fs-sink/fs-sink-stream.c
@@ -23,13 +23,13 @@
 #define BT_LOG_TAG "PLUGIN-CTF-FS-SINK-STREAM"
 #include "logging.h"
 
-#include <babeltrace/babeltrace.h>
+#include <babeltrace2/babeltrace.h>
 #include <stdio.h>
 #include <stdbool.h>
 #include <glib.h>
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/ctfser-internal.h>
-#include <babeltrace/endian-internal.h>
+#include <babeltrace2/assert-internal.h>
+#include <babeltrace2/ctfser-internal.h>
+#include <babeltrace2/endian-internal.h>
 
 #include "fs-sink-trace.h"
 #include "fs-sink-stream.h"
@@ -474,14 +474,16 @@ int write_packet_context(struct fs_sink_stream *stream)
                goto end;
        }
 
-       if (stream->sc->default_clock_class) {
+       if (stream->sc->packets_have_ts_begin) {
                /* Beginning time */
                ret = bt_ctfser_write_byte_aligned_unsigned_int(&stream->ctfser,
                        stream->packet_state.beginning_cs, 8, 64, BYTE_ORDER);
                if (ret) {
                        goto end;
                }
+       }
 
+       if (stream->sc->packets_have_ts_end) {
                /* End time */
                ret = bt_ctfser_write_byte_aligned_unsigned_int(&stream->ctfser,
                        stream->packet_state.end_cs, 8, 64, BYTE_ORDER);
@@ -490,12 +492,14 @@ int write_packet_context(struct fs_sink_stream *stream)
                }
        }
 
-       /* Discarded event counter */
-       ret = bt_ctfser_write_byte_aligned_unsigned_int(&stream->ctfser,
-               stream->packet_state.discarded_events_counter, 8, 64,
-               BYTE_ORDER);
-       if (ret) {
-               goto end;
+       if (stream->sc->has_discarded_events) {
+               /* Discarded event counter */
+               ret = bt_ctfser_write_byte_aligned_unsigned_int(&stream->ctfser,
+                       stream->packet_state.discarded_events_counter, 8, 64,
+                       BYTE_ORDER);
+               if (ret) {
+                       goto end;
+               }
        }
 
        /* Sequence number */
@@ -548,22 +552,46 @@ int fs_sink_stream_open_packet(struct fs_sink_stream *stream,
        }
 
        /* Packet header: magic */
-       bt_ctfser_write_byte_aligned_unsigned_int(&stream->ctfser,
+       ret = bt_ctfser_write_byte_aligned_unsigned_int(&stream->ctfser,
                UINT64_C(0xc1fc1fc1), 8, 32, BYTE_ORDER);
+       if (ret) {
+               BT_LOGE("Error writing packet header magic: stream-file-name=%s",
+                       stream->file_name->str);
+               goto end;
+       }
 
        /* Packet header: UUID */
        for (i = 0; i < BABELTRACE_UUID_LEN; i++) {
-               bt_ctfser_write_byte_aligned_unsigned_int(&stream->ctfser,
+               ret = bt_ctfser_write_byte_aligned_unsigned_int(&stream->ctfser,
                        (uint64_t) stream->sc->tc->uuid[i], 8, 8, BYTE_ORDER);
+               if (ret) {
+                       BT_LOGE("Error writing packet header UUID: stream-file-name=%s",
+                               stream->file_name->str);
+                       goto end;
+               }
        }
 
        /* Packet header: stream class ID */
-       bt_ctfser_write_byte_aligned_unsigned_int(&stream->ctfser,
+       ret = bt_ctfser_write_byte_aligned_unsigned_int(&stream->ctfser,
                bt_stream_class_get_id(stream->sc->ir_sc), 8, 64, BYTE_ORDER);
+       if (ret) {
+               BT_LOGE("Error writing packet header stream class id: "
+                       "stream-file-name=%s, stream-class-id=%"PRIu64,
+                       stream->file_name->str,
+                       bt_stream_class_get_id(stream->sc->ir_sc));
+               goto end;
+       }
 
        /* Packet header: stream ID */
-       bt_ctfser_write_byte_aligned_unsigned_int(&stream->ctfser,
+       ret = bt_ctfser_write_byte_aligned_unsigned_int(&stream->ctfser,
                bt_stream_get_id(stream->ir_stream), 8, 64, BYTE_ORDER);
+       if (ret) {
+               BT_LOGE("Error writing packet header stream id: "
+                       "stream-file-name=%s, stream-id=%"PRIu64,
+                       stream->file_name->str,
+                       bt_stream_get_id(stream->ir_stream));
+               goto end;
+       }
 
        /* Save packet context's offset to rewrite it later */
        stream->packet_state.context_offset_bits =