Allow ctf-writer to use new time-keeping facilities

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/formats/ctf/ir/clock.c b/formats/ctf/ir/clock.c
index 4eed39c718a42a6f67e37883d89929709e95814a..e24b864b04e200d02f02f4cb96d4aaad5d7d3333 100644 (file)
--- a/formats/ctf/ir/clock.c
+++ b/formats/ctf/ir/clock.c
@@ -434,6 +434,21 @@ void bt_ctf_clock_serialize(struct bt_ctf_clock *clock,
        g_string_append(context->string, "};\n\n");
 }
 
+BT_HIDDEN
+int bt_ctf_clock_get_value(struct bt_ctf_clock *clock, uint64_t *value)
+{
+       int ret = 0;
+
+       if (!clock || !value) {
+               ret = -1;
+               goto end;
+       }
+
+       *value = clock->value;
+end:
+       return ret;
+}
+
 static
 void bt_ctf_clock_destroy(struct bt_object *obj)
 {

diff --git a/formats/ctf/ir/event.c b/formats/ctf/ir/event.c
index 4c1d24029d60a150a899f0f305c3cd86bb559f23..01468650c903c350f798c53d5b147c4ff152c699 100644 (file)
--- a/formats/ctf/ir/event.c
+++ b/formats/ctf/ir/event.c
@@ -28,6 +28,7 @@
 
 #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>
@@ -612,11 +613,6 @@ 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);
 
@@ -714,6 +710,7 @@ int bt_ctf_event_populate_event_header(struct bt_ctf_event *event)
 {
        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;
@@ -721,40 +718,60 @@ int bt_ctf_event_populate_event_header(struct bt_ctf_event *event)
        }
 
        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 = 0;
-
-                       // FIXME - Clock refactoring
                        /*
-                       ret = bt_ctf_clock_get_time(mapped_clock, &timestamp);
-                       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,
+                                               &timestamp);
+                               bt_put(clock_value);
+                               if (ret) {
+                                       goto end;
+                               }
+                       } else {
+                               ret = bt_ctf_clock_get_value(mapped_clock,
+                                               &timestamp);
+                               if (ret) {
+                                       goto end;
+                               }
                        }
-                       */
 
                        ret = set_integer_field_value(timestamp_field,
-                               timestamp);
+                                       timestamp);
                        if (ret) {
                                goto end;
                        }
@@ -763,6 +780,7 @@ int bt_ctf_event_populate_event_header(struct bt_ctf_event *event)
 end:
        bt_put(id_field);
        bt_put(timestamp_field);
+       bt_put(mapped_clock);
        return ret;
 }
 

diff --git a/formats/ctf/ir/fields.c b/formats/ctf/ir/fields.c
index 84b8c0780639480879bbe7bb1eab19f04f552344..1a2a2c7f5d95b8a8cae94b9d7dc312bf205abc74 100644 (file)
--- a/formats/ctf/ir/fields.c
+++ b/formats/ctf/ir/fields.c
@@ -2523,7 +2523,7 @@ bool bt_ctf_field_array_is_set(struct bt_ctf_field *field)
 
        array = container_of(field, struct bt_ctf_field_array, parent);
        for (i = 0; i < array->elements->len; i++) {
-               is_set = bt_ctf_field_validate(array->elements->pdata[i]);
+               is_set = bt_ctf_field_is_set(array->elements->pdata[i]);
                if (!is_set) {
                        goto end;
                }

diff --git a/formats/ctf/ir/stream-class.c b/formats/ctf/ir/stream-class.c
index d1cac621a8b022681534436e0196f7f151699978..f5b8923360c9d40f6e4a9e76a97fe11a5529b9d9 100644 (file)
--- a/formats/ctf/ir/stream-class.c
+++ b/formats/ctf/ir/stream-class.c
@@ -421,7 +421,7 @@ int bt_ctf_stream_class_add_event_class(
 
        /* Only set an event ID if none was explicitly set before */
        *event_id = bt_ctf_event_class_get_id(event_class);
-       if (event_id < 0) {
+       if (*event_id < 0) {
                if (bt_ctf_event_class_set_id(event_class,
                        stream_class->next_event_id++)) {
                        ret = -1;

diff --git a/include/babeltrace/ctf-ir/clock-internal.h b/include/babeltrace/ctf-ir/clock-internal.h
index 0ed43ae991e9e85abdf4a4a5b434bbf4862e0ecb..38b0fcf1860ef86a915fd628ad925327adc3deeb 100644 (file)
--- a/include/babeltrace/ctf-ir/clock-internal.h
+++ b/include/babeltrace/ctf-ir/clock-internal.h
@@ -79,4 +79,7 @@ void bt_ctf_clock_serialize(struct bt_ctf_clock *clock,
 BT_HIDDEN
 bool bt_ctf_clock_is_valid(struct bt_ctf_clock *clock);
 
+BT_HIDDEN
+int bt_ctf_clock_get_value(struct bt_ctf_clock *clock, uint64_t *value);
+
 #endif /* BABELTRACE_CTF_IR_CLOCK_INTERNAL_H */

diff --git a/lib/plugin-system/notification/event.c b/lib/plugin-system/notification/event.c
index 9d99a0d69a847ece158cc56eb386e23a20f26fb8..eb57090968cb6d153c20a205db4980a28bac25e0 100644 (file)
--- a/lib/plugin-system/notification/event.c
+++ b/lib/plugin-system/notification/event.c
@@ -45,7 +45,12 @@ struct bt_notification *bt_notification_event_create(struct bt_ctf_event *event)
                goto error;
        }
 
+       // FIXME - Validate that the event is associated to a packet
+       //         and freeze the event.
        notification = g_new0(struct bt_notification_event, 1);
+       if (!notification) {
+               goto error;
+       }
        bt_notification_init(&notification->parent,
                        BT_NOTIFICATION_TYPE_EVENT,
                        bt_notification_event_destroy);