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
}
/* 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;
}
}
return ret;
}
+static
+void reset_structure_field(struct bt_ctf_field *structure, const char *name)
+{
+ struct bt_ctf_field *member;
+
+ member = bt_ctf_field_structure_get_field(structure, name);
+ assert(member);
+ (void) bt_ctf_field_reset(member);
+ bt_put(member);
+}
+
int bt_ctf_stream_flush(struct bt_ctf_stream *stream)
{
int ret = 0;
size_t i;
- uint64_t timestamp_begin, timestamp_end, events_discarded;
+ uint64_t timestamp_begin, timestamp_end;
struct bt_ctf_field *integer = NULL;
struct ctf_stream_pos packet_context_pos;
bool empty_packet;
uint64_t packet_size_bits;
+ struct {
+ bool timestamp_begin;
+ bool timestamp_end;
+ bool content_size;
+ bool packet_size;
+ } auto_set_fields = { 0 };
if (!stream || stream->pos.fd < 0) {
/*
/* mmap the next packet */
ctf_packet_seek(&stream->pos.parent, 0, SEEK_CUR);
-
ret = bt_ctf_field_serialize(stream->packet_header, &stream->pos);
if (ret) {
goto end;
if (!empty_packet && !get_event_header_timestamp(
((struct bt_ctf_event *) g_ptr_array_index(
stream->events, 0))->event_header, ×tamp_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;
}
+ auto_set_fields.timestamp_begin = ret == 1;
}
if (!empty_packet && !get_event_header_timestamp(
stream->events, stream->events->len - 1))->event_header,
×tamp_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;
}
+ auto_set_fields.timestamp_end = ret == 1;
}
- 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;
}
+ auto_set_fields.content_size = ret == 1;
- 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;
}
+ auto_set_fields.packet_size = ret == 1;
/* Write packet context */
memcpy(&packet_context_pos, &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);
- 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++) {
struct bt_ctf_event *event = g_ptr_array_index(
stream->events, i);
- ret = bt_ctf_field_reset(event->event_header);
- if (ret) {
- goto end;
- }
-
/* Write event header */
ret = bt_ctf_field_serialize(event->event_header,
&stream->pos);
* a packet is resized).
*/
packet_context_pos.base_mma = stream->pos.base_mma;
- ret = set_structure_field_integer(stream->packet_context,
- "content_size", stream->pos.offset);
- if (ret) {
- goto end;
+ if (auto_set_fields.content_size) {
+ ret = set_structure_field_integer(
+ stream->packet_context,
+ "content_size", stream->pos.offset);
+ if (ret < 0) {
+ goto end;
+ }
}
- ret = set_structure_field_integer(stream->packet_context,
- "packet_size", packet_size_bits);
- if (ret) {
- goto end;
+ if (auto_set_fields.packet_size) {
+ ret = set_structure_field_integer(stream->packet_context,
+ "packet_size", packet_size_bits);
+ if (ret < 0) {
+ goto end;
+ }
}
ret = bt_ctf_field_serialize(stream->packet_context,
stream->flushed_packet_count++;
stream->size += packet_size_bits / CHAR_BIT;
end:
+ /* Reset automatically-set fields. */
+ if (auto_set_fields.timestamp_begin) {
+ reset_structure_field(stream->packet_context,
+ "timestamp_begin");
+ }
+ if (auto_set_fields.timestamp_end) {
+ reset_structure_field(stream->packet_context,
+ "timestamp_end");
+ }
+ if (auto_set_fields.packet_size) {
+ reset_structure_field(stream->packet_context,
+ "packet_size");
+ }
+ if (auto_set_fields.content_size) {
+ reset_structure_field(stream->packet_context,
+ "content_size");
+ }
bt_put(integer);
+
+ if (ret < 0) {
+ /*
+ * We failed to write the packet. Its size is therefore set to 0
+ * to ensure the next mapping is done in the same place rather
+ * than advancing by "stream->pos.packet_size", which would
+ * leave a corrupted packet in the trace.
+ */
+ stream->pos.packet_size = 0;
+ }
return ret;
}
}
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;
}
/* 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) {
/*
} 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;
projects / babeltrace.git / blobdiff