Implement bt_ctf_clock_value interface

[babeltrace.git] / formats / ctf / ir / event.c

diff --git a/formats/ctf/ir/event.c b/formats/ctf/ir/event.c
index 4202b8ff975dbb893ea733891cdcd8fa62697c6d..beac9d489ca3f895938c977c730018471c81d3b8 100644 (file)
--- a/formats/ctf/ir/event.c
+++ b/formats/ctf/ir/event.c
@@ -33,6 +33,7 @@
 #include <babeltrace/ctf-ir/event-class-internal.h>
 #include <babeltrace/ctf-ir/stream-class.h>
 #include <babeltrace/ctf-ir/stream-class-internal.h>
+#include <babeltrace/ctf-ir/stream-internal.h>
 #include <babeltrace/ctf-ir/packet.h>
 #include <babeltrace/ctf-ir/packet-internal.h>
 #include <babeltrace/ctf-ir/trace-internal.h>
@@ -154,6 +155,8 @@ struct bt_ctf_event *bt_ctf_event_create(struct bt_ctf_event_class *event_class)
         * lifetime.
         */
        event->event_class = bt_get(event_class);
+       event->clock_values = g_hash_table_new_full(g_direct_hash,
+               g_direct_equal, NULL, g_free);
        event_header =
                bt_ctf_field_create(validation_output.event_header_type);
        if (!event_header) {
@@ -256,7 +259,27 @@ end:
 
 struct bt_ctf_stream *bt_ctf_event_get_stream(struct bt_ctf_event *event)
 {
-       return (struct bt_ctf_stream *) bt_object_get_parent(event);
+       struct bt_ctf_stream *stream = NULL;
+
+       if (!event) {
+               goto end;
+       }
+
+       /*
+        * If the event has a parent, then this is its (writer) stream.
+        * If the event has no parent, then if it has a packet, this
+        * is its (non-writer) stream.
+        */
+       if (event->base.parent) {
+               stream = (struct bt_ctf_stream *) bt_object_get_parent(event);
+       } else {
+               if (event->packet) {
+                       stream = bt_get(event->packet->stream);
+               }
+       }
+
+end:
+       return stream;
 }
 
 struct bt_ctf_clock *bt_ctf_event_get_clock(struct bt_ctf_event *event)
@@ -568,6 +591,7 @@ void bt_ctf_event_destroy(struct bt_object *obj)
                 */
                bt_put(event->event_class);
        }
+       g_hash_table_destroy(event->clock_values);
        bt_put(event->event_header);
        bt_put(event->stream_event_context);
        bt_put(event->context_payload);
@@ -576,6 +600,27 @@ void bt_ctf_event_destroy(struct bt_object *obj)
        g_free(event);
 }
 
+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;
+}
+
 static
 int set_integer_field_value(struct bt_ctf_field* field, uint64_t value)
 {
@@ -717,13 +762,16 @@ int bt_ctf_event_populate_event_header(struct bt_ctf_event *event)
                        timestamp_field_type);
                bt_put(timestamp_field_type);
                if (mapped_clock) {
-                       int64_t timestamp;
+                       int64_t timestamp = 0;
 
+                       // FIXME - Clock refactoring
+                       /*
                        ret = bt_ctf_clock_get_time(mapped_clock, &timestamp);
                        bt_put(mapped_clock);
                        if (ret) {
                                goto end;
                        }
+                       */
 
                        ret = set_integer_field_value(timestamp_field,
                                timestamp);
@@ -738,9 +786,24 @@ end:
        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)
 {
+       struct bt_ctf_stream_class *event_stream_class = NULL;
+       struct bt_ctf_stream_class *packet_stream_class = NULL;
        struct bt_ctf_stream *stream = NULL;
        int ret = 0;
 
@@ -760,15 +823,27 @@ int bt_ctf_event_set_packet(struct bt_ctf_event *event,
                        goto end;
                }
        } else {
-               /* Set the event's parent to the packet's stream */
-               bt_object_set_parent(event, packet->stream);
+               event_stream_class =
+                       bt_ctf_event_class_get_stream_class(event->event_class);
+               packet_stream_class =
+                       bt_ctf_stream_get_class(packet->stream);
+
+               assert(event_stream_class);
+               assert(packet_stream_class);
+
+               if (event_stream_class != packet_stream_class) {
+                       ret = -1;
+                       goto end;
+               }
        }
 
-       bt_put(event->packet);
-       event->packet = bt_get(packet);
+       bt_get(packet);
+       BT_MOVE(event->packet, packet);
 
 end:
        BT_PUT(stream);
+       BT_PUT(event_stream_class);
+       BT_PUT(packet_stream_class);
 
        return ret;
 }