sink.ctf.fs: support packets, DE, and DP w/o beginning/end clock snapshots

[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 c11305b722a7029d6c9cfb3b1cd9bc941655aad9..26977c2f36cda1e5470eb6d5d0953d9bfa0adbc1 100644 (file)
--- a/plugins/ctf/fs-sink/fs-sink-stream.c
+++ b/plugins/ctf/fs-sink/fs-sink-stream.c
@@ -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 */