Writer: set the discarded events's value before serializing

[babeltrace.git] / formats / ctf / ir / stream.c

diff --git a/formats/ctf/ir/stream.c b/formats/ctf/ir/stream.c
index 979d40e92839fd94f066bad1d8d226e5153e170b..3de77b4182c7801fbe32d7aa3f8abced8a535a03 100644 (file)
--- a/formats/ctf/ir/stream.c
+++ b/formats/ctf/ir/stream.c
@@ -884,12 +884,18 @@ int bt_ctf_stream_flush(struct bt_ctf_stream *stream)
                goto end;
        }
 
-       empty_packet = (stream->events->len == 0);
-       ret = bt_ctf_field_validate(stream->packet_header);
-       if (ret) {
+       if (!stream->packet_context && stream->flushed_packet_count > 0) {
+               /*
+                * A stream without a packet context, and thus without
+                * content and packet size members, can't have more than
+                * one packet.
+                */
+               ret = -1;
                goto end;
        }
 
+       empty_packet = (stream->events->len == 0);
+
        /* mmap the next packet */
        ctf_packet_seek(&stream->pos.parent, 0, SEEK_CUR);
 
@@ -933,30 +939,23 @@ int bt_ctf_stream_flush(struct bt_ctf_stream *stream)
                        goto end;
                }
 
-               /* Write packet context */
-               memcpy(&packet_context_pos, &stream->pos,
-                       sizeof(struct ctf_stream_pos));
-               ret = bt_ctf_field_serialize(stream->packet_context,
-                       &stream->pos);
-               if (ret) {
-                       goto end;
-               }
-
                ret = bt_ctf_stream_get_discarded_events_count(stream,
                        &events_discarded);
                if (ret) {
                        goto end;
                }
 
-               /* Unset the packet context's fields. */
-               ret = bt_ctf_field_reset(stream->packet_context);
+               ret = set_structure_field_integer(stream->packet_context,
+                       "events_discarded", events_discarded);
                if (ret) {
                        goto end;
                }
 
-               /* Set the previous number of discarded events. */
-               ret = set_structure_field_integer(stream->packet_context,
-                       "events_discarded", events_discarded);
+               /* Write packet context */
+               memcpy(&packet_context_pos, &stream->pos,
+                       sizeof(struct ctf_stream_pos));
+               ret = bt_ctf_field_serialize(stream->packet_context,
+                       &stream->pos);
                if (ret) {
                        goto end;
                }