From 10cb7b4125950ce5d5aa8a894f7e6d2824c6cd2b Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Thu, 2 Feb 2017 12:57:57 -0500 Subject: [PATCH] Writer: set the discarded events's value before serializing MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- formats/ctf/ir/stream.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/formats/ctf/ir/stream.c b/formats/ctf/ir/stream.c index c0b4e979..3de77b41 100644 --- a/formats/ctf/ir/stream.c +++ b/formats/ctf/ir/stream.c @@ -939,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; } -- 2.34.1