Add bt_ctf_event_get_packet

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

diff --git a/formats/ctf/ir/event.c b/formats/ctf/ir/event.c
index 0b49abbef4e4db74cb977f8c42939ad73b9ee23b..13bf8a44c965b930799630d5ffda06527ccf0209 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,6 +783,19 @@ 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)
 {
@@ -766,14 +820,6 @@ int bt_ctf_event_set_packet(struct bt_ctf_event *event,
                        goto end;
                }
        } else {
-               /*
-                * This event is an orphan for the moment: it's not
-                * associated to a stream. If this event's event
-                * class's stream class is the same as the packet's
-                * stream's stream class, then it's okay to make the
-                * packet's stream the parent of this event. Otherwise
-                * it's an error.
-                */
                event_stream_class =
                        bt_ctf_event_class_get_stream_class(event->event_class);
                packet_stream_class =
@@ -786,12 +832,10 @@ int bt_ctf_event_set_packet(struct bt_ctf_event *event,
                        ret = -1;
                        goto end;
                }
-
-               bt_object_set_parent(event, packet->stream);
        }
 
-       bt_put(event->packet);
-       event->packet = bt_get(packet);
+       bt_get(packet);
+       BT_MOVE(event->packet, packet);
 
 end:
        BT_PUT(stream);
@@ -846,24 +890,3 @@ int bt_ctf_event_register_stream_clock_values(struct bt_ctf_event *event)
 
        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;
-}