From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Thu, 2 Feb 2017 17:57:57 +0000 (-0500)
Subject: Writer: set the discarded events's value before serializing
X-Git-Tag: v2.0.0-pre1~517
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=10cb7b4125950ce5d5aa8a894f7e6d2824c6cd2b

Writer: set the discarded events's value before serializing

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

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;
 		}