goto end;
}
- if (!bt_ctf_field_validate(magic_field)) {
+ if (bt_ctf_field_is_set(magic_field)) {
/* Value already set. Not an error, skip. */
goto end;
}
goto end;
}
- if (!bt_ctf_field_validate(uuid_field)) {
+ if (bt_ctf_field_is_set(uuid_field)) {
/* Value already set. Not an error, skip. */
goto end;
}
goto end;
}
- if (!bt_ctf_field_validate(stream_id_field)) {
+ if (bt_ctf_field_is_set(stream_id_field)) {
/* Value already set. Not an error, skip. */
goto end;
}
goto end;
}
+ /*
+ * The event is not supposed to have a parent stream at this
+ * point. The only other way an event can have a parent stream
+ * is if it was assigned when setting a packet to the event,
+ * in which case the packet's stream is not a writer stream,
+ * and thus the user is trying to append an event which belongs
+ * to another stream.
+ */
+ if (event->base.parent) {
+ ret = -1;
+ goto end;
+ }
+
bt_object_set_parent(event, stream);
ret = bt_ctf_event_populate_event_header(event);
if (ret) {
- goto end;
+ goto error;
}
/* Make sure the various scopes of the event are set */
ret = bt_ctf_event_validate(event);
if (ret) {
- goto end;
+ goto error;
}
/* Save the new event and freeze it */
* longer needed.
*/
bt_put(event->event_class);
+
end:
- if (ret) {
- /*
- * Orphan the event; we were not succesful in associating it to
- * a stream.
- */
- bt_object_set_parent(event, NULL);
- }
+ return ret;
+
+error:
+ /*
+ * Orphan the event; we were not successful in associating it to
+ * a stream.
+ */
+ bt_object_set_parent(event, NULL);
+
return ret;
}
int ret = 0;
struct bt_ctf_field_type *field_type;
- if (!stream || !field || stream->pos.fd < 0) {
+ if (!stream || stream->pos.fd < 0) {
ret = -1;
goto end;
}
}
bt_put(field_type);
- bt_get(field);
bt_put(stream->packet_context);
- stream->packet_context = field;
+ stream->packet_context = bt_get(field);
end:
return ret;
}
struct bt_ctf_trace *trace = NULL;
struct bt_ctf_field_type *field_type = NULL;
- if (!stream || !field || stream->pos.fd < 0) {
+ if (!stream || stream->pos.fd < 0) {
ret = -1;
goto end;
}
goto end;
}
- bt_get(field);
bt_put(stream->packet_header);
- stream->packet_header = field;
+ stream->packet_header = bt_get(field);
end:
BT_PUT(trace);
bt_put(field_type);
if (stream->name) {
g_string_free(stream->name, TRUE);
}
+
bt_put(stream->packet_header);
bt_put(stream->packet_context);
- bt_put(stream->event_context);
g_free(stream);
}
}
/* Make sure the payload has not already been set. */
- if (!bt_ctf_field_validate(integer)) {
+ if (bt_ctf_field_is_set(integer)) {
/* Payload already set, not an error */
goto end;
}
end:
return name;
}
+
+int bt_ctf_stream_is_writer(struct bt_ctf_stream *stream)
+{
+ int ret = -1;
+
+ if (!stream) {
+ goto end;
+ }
+
+ ret = (stream->pos.fd >= 0);
+
+end:
+ return ret;
+}