Notification iterator: transform precondition checks to BT_ASSERT_PRE()

[babeltrace.git] / include / babeltrace / ctf-ir / stream-internal.h

diff --git a/include/babeltrace/ctf-ir/stream-internal.h b/include/babeltrace/ctf-ir/stream-internal.h
index 87395b107f37f609a9231401856e3261ced9ab0b..3214c1653c09073b79019712f6b8193b35a0a124 100644 (file)
--- a/include/babeltrace/ctf-ir/stream-internal.h
+++ b/include/babeltrace/ctf-ir/stream-internal.h
@@ -34,77 +34,58 @@
 #include <babeltrace/ctf-writer/event-types.h>
 #include <babeltrace/ctf-writer/serialize-internal.h>
 #include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/assert-internal.h>
 #include <glib.h>
 
 struct bt_port;
 struct bt_component;
 
-typedef void (*bt_ctf_stream_destroy_listener_func)(
-               struct bt_ctf_stream *stream, void *data);
+typedef void (*bt_stream_destroy_listener_func)(
+               struct bt_stream *stream, void *data);
 
-struct bt_ctf_stream_destroy_listener {
-       bt_ctf_stream_destroy_listener_func func;
+struct bt_stream_destroy_listener {
+       bt_stream_destroy_listener_func func;
        void *data;
 };
 
-struct bt_ctf_stream {
+struct bt_stream {
        struct bt_object base;
        int64_t id;
-       struct bt_ctf_stream_class *stream_class;
+       struct bt_stream_class *stream_class;
        GString *name;
-       struct bt_ctf_field *packet_header;
-       struct bt_ctf_field *packet_context;
-
-       /*
-        * When a notification which contains a reference to a stream
-        * object (event notification, for example) is returned by the
-        * "next" method of a sink or filter component's notification
-        * iterator, it must NOT be returned by the "next" method of a
-        * notification iterator which iterates on the notifications of
-        * another output port of the same component.
-        *
-        * To ensure this, the stream object keeps a hash table which
-        * indicates which port, for a given component, is currently
-        * allowed to emit notifications which contain a reference to
-        * this stream.
-        *
-        * This is a `struct bt_component *` to `struct bt_port *` hash
-        * table. Both pointers are weak references because there's no
-        * need to keep one or the other alive as far as this stream is
-        * concerned.
-        */
-       GHashTable *comp_cur_port;
+       struct bt_field *packet_header;
+       struct bt_field *packet_context;
 
        /* Writer-specific members. */
-       /* Array of pointers to bt_ctf_event for the current packet */
+       /* Array of pointers to bt_event for the current packet */
        GPtrArray *events;
-       struct bt_ctf_stream_pos pos;
+       struct bt_stream_pos pos;
        unsigned int flushed_packet_count;
        uint64_t discarded_events;
        uint64_t size;
+       uint64_t last_ts_end;
 
-       /* Array of struct bt_ctf_stream_destroy_listener */
+       /* Array of struct bt_stream_destroy_listener */
        GArray *destroy_listeners;
 };
 
 BT_HIDDEN
-int bt_ctf_stream_set_fd(struct bt_ctf_stream *stream, int fd);
-
-BT_HIDDEN
-void bt_ctf_stream_map_component_to_port(struct bt_ctf_stream *stream,
-               struct bt_component *comp,
-               struct bt_port *port);
+int bt_stream_set_fd(struct bt_stream *stream, int fd);
 
 BT_HIDDEN
-struct bt_port *bt_ctf_stream_port_for_component(struct bt_ctf_stream *stream,
-               struct bt_component *comp);
+void bt_stream_add_destroy_listener(struct bt_stream *stream,
+               bt_stream_destroy_listener_func func, void *data);
 
 BT_HIDDEN
-void bt_ctf_stream_add_destroy_listener(struct bt_ctf_stream *stream,
-               bt_ctf_stream_destroy_listener_func func, void *data);
+void bt_stream_remove_destroy_listener(struct bt_stream *stream,
+               bt_stream_destroy_listener_func func, void *data);
 
-BT_HIDDEN
-void bt_ctf_stream_remove_destroy_listener(struct bt_ctf_stream *stream,
-               bt_ctf_stream_destroy_listener_func func, void *data);
+static inline
+struct bt_stream_class *bt_stream_borrow_stream_class(
+               struct bt_stream *stream)
+{
+       BT_ASSERT(stream);
+       return stream->stream_class;
+}
 
 #endif /* BABELTRACE_CTF_WRITER_STREAM_INTERNAL_H */