X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fmessage%2Fiterator.h;h=f6e642b42650f31d4ba6e671cdfa95ec2ac95914;hb=43c59509042845f8d42c3e99ec74d45fa2dc0908;hp=f48872ece5dde7d748f895ad430bf2dff8754280;hpb=8a4328893c7222e490da887e1caec4e61fe3d56e;p=babeltrace.git diff --git a/src/lib/graph/message/iterator.h b/src/lib/graph/message/iterator.h index f48872ec..f6e642b4 100644 --- a/src/lib/graph/message/iterator.h +++ b/src/lib/graph/message/iterator.h @@ -26,8 +26,8 @@ #include "common/macros.h" #include "lib/object.h" -#include -#include +#include +#include #include #include "common/assert.h" #include @@ -36,76 +36,72 @@ struct bt_port; struct bt_graph; -enum bt_message_iterator_type { - BT_MESSAGE_ITERATOR_TYPE_SELF_COMPONENT_PORT_INPUT, - BT_MESSAGE_ITERATOR_TYPE_PORT_OUTPUT, -}; - -enum bt_self_component_port_input_message_iterator_state { +enum bt_message_iterator_state { /* Iterator is not initialized */ - BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_NON_INITIALIZED, + BT_MESSAGE_ITERATOR_STATE_NON_INITIALIZED, /* Iterator is active, not at the end yet, and not finalized */ - BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ACTIVE, + BT_MESSAGE_ITERATOR_STATE_ACTIVE, /* * Iterator is ended, not finalized yet: the "next" method * returns BT_MESSAGE_ITERATOR_STATUS_END. */ - BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ENDED, + BT_MESSAGE_ITERATOR_STATE_ENDED, /* Iterator is currently being finalized */ - BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_FINALIZING, + BT_MESSAGE_ITERATOR_STATE_FINALIZING, /* Iterator is finalized */ - BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_FINALIZED, + BT_MESSAGE_ITERATOR_STATE_FINALIZED, /* Iterator is seeking */ - BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_SEEKING, + BT_MESSAGE_ITERATOR_STATE_SEEKING, /* Iterator did seek, but returned `BT_MESSAGE_ITERATOR_STATUS_AGAIN` */ - BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_AGAIN, + BT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_AGAIN, /* Iterator did seek, but returned error status */ - BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_ERROR, + BT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_ERROR, }; -struct bt_message_iterator { - struct bt_object base; - enum bt_message_iterator_type type; - GPtrArray *msgs; -}; - -typedef enum bt_component_class_message_iterator_next_method_status -(*bt_self_component_port_input_message_iterator_next_method)( +typedef enum bt_message_iterator_class_next_method_status +(*bt_message_iterator_next_method)( void *, bt_message_array_const, uint64_t, uint64_t *); -typedef enum bt_component_class_message_iterator_seek_ns_from_origin_method_status -(*bt_self_component_port_input_message_iterator_seek_ns_from_origin_method)( +typedef enum bt_message_iterator_class_seek_ns_from_origin_method_status +(*bt_message_iterator_seek_ns_from_origin_method)( void *, int64_t); -typedef enum bt_component_class_message_iterator_seek_beginning_method_status -(*bt_self_component_port_input_message_iterator_seek_beginning_method)( +typedef enum bt_message_iterator_class_seek_beginning_method_status +(*bt_message_iterator_seek_beginning_method)( void *); -typedef bt_bool -(*bt_self_component_port_input_message_iterator_can_seek_ns_from_origin_method)( - void *, int64_t); +typedef enum bt_message_iterator_class_can_seek_ns_from_origin_method_status +(*bt_message_iterator_can_seek_ns_from_origin_method)( + void *, int64_t, bt_bool *); -typedef bt_bool -(*bt_self_component_port_input_message_iterator_can_seek_beginning_method)( - void *); +typedef enum bt_message_iterator_class_can_seek_beginning_method_status +(*bt_message_iterator_can_seek_beginning_method)( + void *, bt_bool *); + +struct bt_self_message_iterator_configuration { + bool frozen; + bool can_seek_forward; +}; -struct bt_self_component_port_input_message_iterator { - struct bt_message_iterator base; +struct bt_message_iterator { + struct bt_object base; + GPtrArray *msgs; struct bt_component *upstream_component; /* Weak */ struct bt_port *upstream_port; /* Weak */ struct bt_connection *connection; /* Weak */ struct bt_graph *graph; /* Weak */ + struct bt_self_message_iterator_configuration config; /* * Array of - * `struct bt_self_component_port_input_message_iterator *` + * `struct bt_message_iterator *` * (weak). * * This is an array of upstream message iterators on which this @@ -122,17 +118,21 @@ struct bt_self_component_port_input_message_iterator { * This can be `NULL` if this message iterator's owner is a sink * component. */ - struct bt_self_component_port_input_message_iterator *downstream_msg_iter; + struct bt_message_iterator *downstream_msg_iter; struct { - bt_self_component_port_input_message_iterator_next_method next; - bt_self_component_port_input_message_iterator_seek_ns_from_origin_method seek_ns_from_origin; - bt_self_component_port_input_message_iterator_seek_beginning_method seek_beginning; - bt_self_component_port_input_message_iterator_can_seek_ns_from_origin_method can_seek_ns_from_origin; - bt_self_component_port_input_message_iterator_can_seek_beginning_method can_seek_beginning; + bt_message_iterator_next_method next; + + /* These two are always both set or both unset. */ + bt_message_iterator_seek_ns_from_origin_method seek_ns_from_origin; + bt_message_iterator_can_seek_ns_from_origin_method can_seek_ns_from_origin; + + /* These two are always both set or both unset. */ + bt_message_iterator_seek_beginning_method seek_beginning; + bt_message_iterator_can_seek_beginning_method can_seek_beginning; } methods; - enum bt_self_component_port_input_message_iterator_state state; + enum bt_message_iterator_state state; /* * Timestamp of the last received message (or INT64_MIN in the @@ -199,45 +199,33 @@ struct bt_self_component_port_input_message_iterator { void *user_data; }; -struct bt_port_output_message_iterator { - struct bt_message_iterator base; - struct bt_graph *graph; /* Owned by this */ - struct bt_component_sink *colander; /* Owned by this */ - - /* - * Only used temporarily as a bridge between a colander sink and - * the user. - */ - uint64_t count; -}; - BT_HIDDEN -void bt_self_component_port_input_message_iterator_try_finalize( - struct bt_self_component_port_input_message_iterator *iterator); +void bt_message_iterator_try_finalize( + struct bt_message_iterator *iterator); BT_HIDDEN -void bt_self_component_port_input_message_iterator_set_connection( - struct bt_self_component_port_input_message_iterator *iterator, +void bt_message_iterator_set_connection( + struct bt_message_iterator *iterator, struct bt_connection *connection); static inline -const char *bt_self_component_port_input_message_iterator_state_string( - enum bt_self_component_port_input_message_iterator_state state) +const char *bt_message_iterator_state_string( + enum bt_message_iterator_state state) { switch (state) { - case BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ACTIVE: + case BT_MESSAGE_ITERATOR_STATE_ACTIVE: return "ACTIVE"; - case BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ENDED: + case BT_MESSAGE_ITERATOR_STATE_ENDED: return "ENDED"; - case BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_FINALIZING: + case BT_MESSAGE_ITERATOR_STATE_FINALIZING: return "FINALIZING"; - case BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_FINALIZED: + case BT_MESSAGE_ITERATOR_STATE_FINALIZED: return "FINALIZED"; - case BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_SEEKING: + case BT_MESSAGE_ITERATOR_STATE_SEEKING: return "SEEKING"; - case BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_AGAIN: + case BT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_AGAIN: return "LAST_SEEKING_RETURNED_AGAIN"; - case BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_ERROR: + case BT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_ERROR: return "LAST_SEEKING_RETURNED_ERROR"; default: return "(unknown)";