Writer: introduce try_set_structure_integer_field

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

diff --git a/formats/ctf/ir/stream.c b/formats/ctf/ir/stream.c
index 979d40e92839fd94f066bad1d8d226e5153e170b..4fe0589d00366a9e23be1a5a7c6e2ebb1e32fe4d 100644 (file)
--- a/formats/ctf/ir/stream.c
+++ b/formats/ctf/ir/stream.c
@@ -47,6 +47,8 @@
 static
 void bt_ctf_stream_destroy(struct bt_object *obj);
 static
+int try_set_structure_field_integer(struct bt_ctf_field *, char *, uint64_t);
+static
 int set_structure_field_integer(struct bt_ctf_field *, char *, uint64_t);
 
 static
@@ -392,9 +394,10 @@ struct bt_ctf_stream *bt_ctf_stream_create(
                        }
 
                        /* Initialize events_discarded */
-                       ret = set_structure_field_integer(stream->packet_context,
+                       ret = try_set_structure_field_integer(
+                               stream->packet_context,
                                "events_discarded", 0);
-                       if (ret) {
+                       if (ret != 1) {
                                goto error;
                        }
                }
@@ -884,12 +887,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);
 
@@ -903,9 +912,10 @@ int bt_ctf_stream_flush(struct bt_ctf_stream *stream)
                if (!empty_packet && !get_event_header_timestamp(
                        ((struct bt_ctf_event *) g_ptr_array_index(
                                stream->events, 0))->event_header, &timestamp_begin)) {
-                       ret = set_structure_field_integer(stream->packet_context,
+                       ret = try_set_structure_field_integer(
+                               stream->packet_context,
                                "timestamp_begin", timestamp_begin);
-                       if (ret) {
+                       if (ret < 0) {
                                goto end;
                        }
                }
@@ -915,21 +925,22 @@ int bt_ctf_stream_flush(struct bt_ctf_stream *stream)
                                stream->events, stream->events->len - 1))->event_header,
                                &timestamp_end)) {
 
-                       ret = set_structure_field_integer(stream->packet_context,
+                       ret = try_set_structure_field_integer(
+                               stream->packet_context,
                                "timestamp_end", timestamp_end);
-                       if (ret) {
+                       if (ret < 0) {
                                goto end;
                        }
                }
-               ret = set_structure_field_integer(stream->packet_context,
+               ret = try_set_structure_field_integer(stream->packet_context,
                        "content_size", UINT64_MAX);
-               if (ret) {
+               if (ret < 0) {
                        goto end;
                }
 
-               ret = set_structure_field_integer(stream->packet_context,
+               ret = try_set_structure_field_integer(stream->packet_context,
                        "packet_size", UINT64_MAX);
-               if (ret) {
+               if (ret < 0) {
                        goto end;
                }
 
@@ -941,25 +952,6 @@ int bt_ctf_stream_flush(struct bt_ctf_stream *stream)
                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);
-               if (ret) {
-                       goto end;
-               }
-
-               /* Set the previous number of discarded events. */
-               ret = set_structure_field_integer(stream->packet_context,
-                       "events_discarded", events_discarded);
-               if (ret) {
-                       goto end;
-               }
        }
 
        for (i = 0; i < stream->events->len; i++) {
@@ -1085,8 +1077,8 @@ void bt_ctf_stream_destroy(struct bt_object *obj)
 }
 
 static
-int set_structure_field_integer(struct bt_ctf_field *structure, char *name,
-               uint64_t value)
+int _set_structure_field_integer(struct bt_ctf_field *structure, char *name,
+               uint64_t value, bool force)
 {
        int ret = 0;
        struct bt_ctf_field_type *field_type = NULL;
@@ -1104,13 +1096,12 @@ int set_structure_field_integer(struct bt_ctf_field *structure, char *name,
        }
 
        /* Make sure the payload has not already been set. */
-       if (bt_ctf_field_is_set(integer)) {
+       if (!force && bt_ctf_field_is_set(integer)) {
                /* Payload already set, not an error */
                goto end;
        }
 
        field_type = bt_ctf_field_get_type(integer);
-       /* Something is serioulsly wrong */
        assert(field_type);
        if (bt_ctf_field_type_get_type_id(field_type) != BT_CTF_TYPE_ID_INTEGER) {
                /*
@@ -1128,12 +1119,33 @@ int set_structure_field_integer(struct bt_ctf_field *structure, char *name,
        } else {
                ret = bt_ctf_field_unsigned_integer_set_value(integer, value);
        }
+       ret = !ret ? 1 : ret;
 end:
        bt_put(integer);
        bt_put(field_type);
        return ret;
 }
 
+static
+int set_structure_field_integer(struct bt_ctf_field *structure, char *name,
+               uint64_t value)
+{
+       return _set_structure_field_integer(structure, name, value, true);
+}
+
+/*
+ * Returns the following codes:
+ * 1 if the field was found and set,
+ * 0 if nothing was done (field not found, or was already set),
+ * <0 if an error was encoutered
+ */
+static
+int try_set_structure_field_integer(struct bt_ctf_field *structure, char *name,
+               uint64_t value)
+{
+       return _set_structure_field_integer(structure, name, value, false);
+}
+
 const char *bt_ctf_stream_get_name(struct bt_ctf_stream *stream)
 {
        const char *name = NULL;