Since a non-writer stream does not know the events that are
associated to it, an event with a non-writer stream parent can
never be destroyed.
Fix this by setting a stream parent if the stream is a writer
stream, and otherwise by using the event's packet's stream.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
struct bt_ctf_stream *bt_ctf_event_get_stream(struct bt_ctf_event *event)
{
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)
}
struct bt_ctf_clock *bt_ctf_event_get_clock(struct bt_ctf_event *event)
- /*
- * 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 =
event_stream_class =
bt_ctf_event_class_get_stream_class(event->event_class);
packet_stream_class =
-
- bt_object_set_parent(event, packet->stream);
- bt_put(event->packet);
- event->packet = bt_get(packet);
+ bt_get(packet);
+ BT_MOVE(event->packet, packet);