Track clock states in notification iterator

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

diff --git a/formats/ctf/ir/event.c b/formats/ctf/ir/event.c
index 63769c935b4895279383a5ba236a95beef4c6620..505aa1049e24a473bf19c98ed70702f69aacfe51 100644 (file)
--- a/formats/ctf/ir/event.c
+++ b/formats/ctf/ir/event.c
@@ -259,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)
@@ -580,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)
 {
@@ -742,9 +783,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;
 
@@ -764,15 +820,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;
 }
@@ -788,58 +856,3 @@ void bt_ctf_event_freeze(struct bt_ctf_event *event)
        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;
-}