#include <babeltrace/ctf-ir/fields-internal.h>
#include <babeltrace/ctf-ir/field-types-internal.h>
+#include <babeltrace/ctf-ir/clock-internal.h>
#include <babeltrace/ctf-ir/event-internal.h>
#include <babeltrace/ctf-ir/event-class.h>
#include <babeltrace/ctf-ir/event-class-internal.h>
*/
event->event_class = bt_get(event_class);
event->clock_values = g_hash_table_new_full(g_direct_hash,
- g_direct_equal, NULL, g_free);
+ g_direct_equal, bt_put, bt_put);
event_header =
bt_ctf_field_create(validation_output.event_header_type);
if (!event_header) {
return stream;
}
-struct bt_ctf_clock *bt_ctf_event_get_clock(struct bt_ctf_event *event)
-{
- struct bt_ctf_clock *clock = NULL;
- struct bt_ctf_event_class *event_class;
- struct bt_ctf_stream_class *stream_class;
-
- if (!event) {
- goto end;
- }
-
- event_class = bt_ctf_event_get_class(event);
- if (!event_class) {
- goto end;
- }
-
- stream_class = bt_ctf_event_class_get_stream_class(event_class);
- if (!stream_class) {
- goto error_put_event_class;
- }
-
- clock = bt_ctf_stream_class_get_clock(stream_class);
- if (!clock) {
- goto error_put_stream_class;
- }
-
-error_put_stream_class:
- bt_put(stream_class);
-error_put_event_class:
- bt_put(event_class);
-end:
- return clock;
-}
-
int bt_ctf_event_set_payload(struct bt_ctf_event *event,
const char *name,
struct bt_ctf_field *payload)
g_free(event);
}
+struct bt_ctf_clock_value *bt_ctf_event_get_clock_value(
+ struct bt_ctf_event *event, struct bt_ctf_clock *clock)
+{
+ struct bt_ctf_clock_value *clock_value = NULL;
+
+ if (!event || !clock) {
+ goto end;
+ }
+
+ clock_value = g_hash_table_lookup(event->clock_values, clock);
+ if (!clock_value) {
+ goto end;
+ }
+
+ bt_get(clock_value);
+end:
+ return clock_value;
+}
+
+int bt_ctf_event_set_clock_value(struct bt_ctf_event *event,
+ struct bt_ctf_clock *clock, struct bt_ctf_clock_value *value)
+{
+ int ret = 0;
+
+ if (!event || !clock || !value || event->frozen) {
+ ret = -1;
+ goto end;
+ }
+
+ g_hash_table_insert(event->clock_values, bt_get(clock), bt_get(value));
+end:
+ return ret;
+}
+
static
int set_integer_field_value(struct bt_ctf_field* field, uint64_t value)
{
goto end;
}
- if (!bt_ctf_field_validate(field)) {
- /* Payload already set, skip! (not an error) */
- goto end;
- }
-
field_type = bt_ctf_field_get_type(field);
assert(field_type);
{
int ret = 0;
struct bt_ctf_field *id_field = NULL, *timestamp_field = NULL;
+ struct bt_ctf_clock *mapped_clock = NULL;
if (!event || event->frozen) {
ret = -1;
}
id_field = bt_ctf_field_structure_get_field(event->event_header, "id");
- if (id_field) {
+ if (id_field && !bt_ctf_field_is_set(id_field)) {
ret = set_integer_field_value(id_field,
(uint64_t) bt_ctf_event_class_get_id(
- event->event_class));
+ event->event_class));
if (ret) {
goto end;
}
}
timestamp_field = bt_ctf_field_structure_get_field(event->event_header,
- "timestamp");
- if (timestamp_field) {
+ "timestamp");
+ if (timestamp_field && !bt_ctf_field_is_set(timestamp_field)) {
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);
+ timestamp_field_type);
bt_put(timestamp_field_type);
if (mapped_clock) {
- int64_t timestamp;
-
- ret = bt_ctf_clock_get_time(mapped_clock, ×tamp);
- bt_put(mapped_clock);
- if (ret) {
- goto end;
+ /*
+ * Babeltrace 2.0 introduced a notion of per-event clock
+ * values which can be queried using a "clock" instance.
+ *
+ * However, the original CTF-Writer (BT 1.x) had a
+ * notion of per-stream clock which is sampled on
+ * a call to append an event to a stream.
+ *
+ * If the event has a clock value associated with the
+ * mapped clock, we ignore the pre-2.0 behaviour and
+ * populate the timestamp field using the clock value.
+ */
+ uint64_t timestamp = 0;
+ struct bt_ctf_clock_value *clock_value;
+
+ clock_value = bt_ctf_event_get_clock_value(event,
+ mapped_clock);
+ if (clock_value) {
+ ret = bt_ctf_clock_value_get_value(clock_value,
+ ×tamp);
+ bt_put(clock_value);
+ if (ret) {
+ goto end;
+ }
+ } else {
+ ret = bt_ctf_clock_get_value(mapped_clock,
+ ×tamp);
+ if (ret) {
+ goto end;
+ }
}
ret = set_integer_field_value(timestamp_field,
- timestamp);
+ timestamp);
if (ret) {
goto end;
}
end:
bt_put(id_field);
bt_put(timestamp_field);
+ bt_put(mapped_clock);
return ret;
}
+struct bt_ctf_packet *bt_ctf_event_get_packet(struct bt_ctf_event *event)
+{
+ struct bt_ctf_packet *packet = NULL;
+
+ if (!event || !event->packet) {
+ goto end;
+ }
+
+ packet = bt_get(event->packet);
+end:
+ return packet;
+}
+
int bt_ctf_event_set_packet(struct bt_ctf_event *event,
struct bt_ctf_packet *packet)
{
bt_ctf_field_freeze(event->fields_payload);
event->frozen = 1;
}
-
-static
-void insert_stream_clock_value_into_event_clock_values(gpointer key,
- gpointer value,
- gpointer data)
-{
- struct bt_ctf_event *event = data;
- uint64_t *clock_value;
-
- assert(event);
-
- /* Copy clock value because it belongs to the hash table */
- clock_value = g_new0(uint64_t, 1);
- *clock_value = *((uint64_t *) value);
-
- /* Insert copy into event clock values */
- g_hash_table_insert(event->clock_values, key, clock_value);
-}
-
-BT_HIDDEN
-int bt_ctf_event_register_stream_clock_values(struct bt_ctf_event *event)
-{
- int ret = 0;
- struct bt_ctf_stream *stream;
-
- stream = bt_ctf_event_get_stream(event);
- assert(stream);
- g_hash_table_remove_all(event->clock_values);
- g_hash_table_foreach(stream->clock_values,
- insert_stream_clock_value_into_event_clock_values, event);
- BT_PUT(stream);
-
- return ret;
-}
-
-uint64_t bt_ctf_event_get_clock_value(struct bt_ctf_event *event,
- struct bt_ctf_clock *clock)
-{
- uint64_t ret = -1ULL;
- uint64_t *clock_value;
-
- if (!event || !clock) {
- goto end;
- }
-
- clock_value = g_hash_table_lookup(event->clock_values, clock);
- if (!clock_value) {
- goto end;
- }
-
- ret = *clock_value;
-
-end:
- return ret;
-}
projects / babeltrace.git / blobdiff