return ret;
}
-BT_HIDDEN
-int bt_ctf_event_set_timestamp(struct bt_ctf_event *event,
- uint64_t timestamp)
-{
- int ret = 0;
-
- assert(event);
- if (event->timestamp) {
- ret = -1;
- goto end;
- }
-
- event->timestamp = timestamp;
-end:
- return ret;
-}
-
-BT_HIDDEN
-uint64_t bt_ctf_event_get_timestamp(struct bt_ctf_event *event)
-{
- assert(event);
- return event->timestamp;
-}
-
BT_HIDDEN
int bt_ctf_event_populate_event_header(struct bt_ctf_event *event)
{
timestamp_field = bt_ctf_field_structure_get_field(event->event_header,
"timestamp");
if (timestamp_field) {
- ret = set_integer_field_value(timestamp_field,
- (uint64_t) event->timestamp);
- if (ret) {
- goto end;
+ struct bt_ctf_field_type *timestamp_field_type =
+ bt_ctf_field_get_type(timestamp_field);
+ struct bt_ctf_clock *mapped_clock;
+
+ assert(timestamp_field_type);
+ mapped_clock = bt_ctf_field_type_integer_get_mapped_clock(
+ timestamp_field_type);
+ bt_ctf_field_type_put(timestamp_field_type);
+ if (mapped_clock) {
+ uint64_t timestamp = bt_ctf_clock_get_time(
+ mapped_clock);
+
+ bt_ctf_clock_put(mapped_clock);
+ if (timestamp == (uint64_t) -1ULL) {
+ goto end;
+ }
+
+ ret = set_integer_field_value(timestamp_field,
+ timestamp);
+ if (ret) {
+ goto end;
+ }
}
}
end:
struct bt_ctf_event *event)
{
int ret = 0;
- uint64_t timestamp;
struct bt_ctf_field *event_context_copy = NULL;
if (!stream || !event) {
}
}
- timestamp = bt_ctf_clock_get_time(stream->stream_class->clock);
- ret = bt_ctf_event_set_timestamp(event, timestamp);
- if (ret) {
- goto end;
- }
-
bt_ctf_event_get(event);
/* Save the new event along with its associated stream event context */
g_ptr_array_add(stream->events, event);
return ret;
}
+static
+int get_event_header_timestamp(struct bt_ctf_field *event_header, uint64_t *timestamp)
+{
+ int ret = 0;
+ struct bt_ctf_field *timestamp_field = NULL;
+ struct bt_ctf_field_type *timestamp_field_type = NULL;
+
+ timestamp_field = bt_ctf_field_structure_get_field(event_header,
+ "timestamp");
+ if (!timestamp_field) {
+ ret = -1;
+ goto end;
+ }
+
+ timestamp_field_type = bt_ctf_field_get_type(timestamp_field);
+ assert(timestamp_field_type);
+ if (bt_ctf_field_type_get_type_id(timestamp_field_type) !=
+ CTF_TYPE_INTEGER) {
+ ret = -1;
+ goto end;
+ }
+
+ if (bt_ctf_field_type_integer_get_signed(timestamp_field_type)) {
+ int64_t val;
+
+ ret = bt_ctf_field_signed_integer_get_value(timestamp_field,
+ &val);
+ if (ret) {
+ goto end;
+ }
+ *timestamp = (uint64_t) val;
+ } else {
+ ret = bt_ctf_field_unsigned_integer_get_value(timestamp_field,
+ timestamp);
+ if (ret) {
+ goto end;
+ }
+ }
+end:
+ bt_ctf_field_put(timestamp_field);
+ bt_ctf_field_type_put(timestamp_field_type);
+ return ret;
+}
+
int bt_ctf_stream_flush(struct bt_ctf_stream *stream)
{
int ret = 0;
goto end;
}
- timestamp_begin = ((struct bt_ctf_event *) g_ptr_array_index(
- stream->events, 0))->timestamp;
- timestamp_end = ((struct bt_ctf_event *) g_ptr_array_index(
- stream->events, stream->events->len - 1))->timestamp;
-
/* Set the default context attributes if present and unset. */
- ret = set_structure_field_integer(stream->packet_context,
- "timestamp_begin", timestamp_begin);
- if (ret) {
- goto end;
+ if (!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,
+ "timestamp_begin", timestamp_begin);
+ if (ret) {
+ goto end;
+ }
}
- ret = set_structure_field_integer(stream->packet_context,
- "timestamp_end", timestamp_end);
- if (ret) {
- goto end;
- }
+ if (!get_event_header_timestamp(
+ ((struct bt_ctf_event *) g_ptr_array_index(
+ stream->events, stream->events->len - 1))->event_header,
+ ×tamp_end)) {
+ ret = set_structure_field_integer(stream->packet_context,
+ "timestamp_end", timestamp_end);
+ if (ret) {
+ goto end;
+ }
+ }
ret = set_structure_field_integer(stream->packet_context,
"content_size", UINT64_MAX);
if (ret) {
for (i = 0; i < stream->events->len; i++) {
struct bt_ctf_event *event = g_ptr_array_index(
stream->events, i);
- uint32_t event_id = bt_ctf_event_class_get_id(
- event->event_class);
- uint64_t timestamp = bt_ctf_event_get_timestamp(event);
ret = bt_ctf_field_reset(event->event_header);
if (ret) {
goto end;
}
- ret = set_structure_field_integer(event->event_header,
- "id", event_id);
- if (ret) {
- goto end;
- }
- ret = set_structure_field_integer(event->event_header,
- "timestamp", timestamp);
- if (ret) {
- goto end;
- }
-
/* Write event header */
ret = bt_ctf_field_serialize(event->event_header,
&stream->pos);