X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fiterator.c;h=dc1c778d919aab3657623b4244519a459e0d5939;hb=9340eff9237ee05d044f7953495300506e152315;hp=d8478553bb98c6d32005b5f38224461141564888;hpb=d98421f2abfc5adab28ab7ee9b63537a6c7261cc;p=babeltrace.git diff --git a/src/lib/graph/iterator.c b/src/lib/graph/iterator.c index d8478553..dc1c778d 100644 --- a/src/lib/graph/iterator.c +++ b/src/lib/graph/iterator.c @@ -59,11 +59,29 @@ #define MSG_BATCH_SIZE 15 #define BT_ASSERT_PRE_ITER_HAS_STATE_TO_SEEK(_iter) \ - BT_ASSERT_PRE((_iter)->state == BT_MESSAGE_ITERATOR_STATE_ACTIVE || \ - (_iter)->state == BT_MESSAGE_ITERATOR_STATE_ENDED || \ + BT_ASSERT_PRE("has-state-to-seek", \ + (_iter)->state == BT_MESSAGE_ITERATOR_STATE_ACTIVE || \ + (_iter)->state == BT_MESSAGE_ITERATOR_STATE_ENDED || \ (_iter)->state == BT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_AGAIN || \ (_iter)->state == BT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_ERROR, \ - "Message iterator is in the wrong state: %!+i", _iter) + "Message iterator is in the wrong state: %!+i", (_iter)) + +#ifdef BT_DEV_MODE +struct per_stream_state +{ + bt_packet *cur_packet; +}; +#endif + +static void +clear_per_stream_state (struct bt_message_iterator *iterator) +{ +#ifdef BT_DEV_MODE + g_hash_table_remove_all(iterator->per_stream_state); +#else + BT_USE_EXPR(iterator); +#endif +} static inline void set_msg_iterator_state(struct bt_message_iterator *iterator, @@ -134,10 +152,13 @@ void bt_message_iterator_destroy(struct bt_object *obj) iterator->msgs = NULL; } +#ifdef BT_DEV_MODE + g_hash_table_destroy(iterator->per_stream_state); +#endif + g_free(iterator); } -BT_HIDDEN void bt_message_iterator_try_finalize( struct bt_message_iterator *iterator) { @@ -200,6 +221,7 @@ void bt_message_iterator_try_finalize( BT_LIB_LOGD("Calling user's finalization method: %!+i", iterator); method(iterator); + BT_ASSERT_POST_NO_ERROR("bt_message_iterator_class_finalize_method"); if (saved_error) { BT_CURRENT_THREAD_MOVE_ERROR_AND_RESET(saved_error); @@ -238,7 +260,6 @@ end: return; } -BT_HIDDEN void bt_message_iterator_set_connection( struct bt_message_iterator *iterator, struct bt_connection *connection) @@ -251,8 +272,9 @@ void bt_message_iterator_set_connection( static enum bt_message_iterator_can_seek_beginning_status can_seek_ns_from_origin_true( - struct bt_message_iterator *iterator, - int64_t ns_from_origin, bt_bool *can_seek) + struct bt_message_iterator *iterator __attribute__((unused)), + int64_t ns_from_origin __attribute__((unused)), + bt_bool *can_seek) { *can_seek = BT_TRUE; @@ -261,7 +283,7 @@ enum bt_message_iterator_can_seek_beginning_status can_seek_ns_from_origin_true( static enum bt_message_iterator_can_seek_beginning_status can_seek_beginning_true( - struct bt_message_iterator *iterator, + struct bt_message_iterator *iterator __attribute__((unused)), bt_bool *can_seek) { *can_seek = BT_TRUE; @@ -273,7 +295,8 @@ static int create_self_component_input_port_message_iterator( struct bt_self_message_iterator *self_downstream_msg_iter, struct bt_self_component_port_input *self_port, - struct bt_message_iterator **message_iterator) + struct bt_message_iterator **message_iterator, + const char *api_func) { bt_message_iterator_class_initialize_method init_method = NULL; struct bt_message_iterator *iterator = @@ -288,19 +311,23 @@ int create_self_component_input_port_message_iterator( struct bt_component_class_with_iterator_class *upstream_comp_cls_with_iter_cls; int status; - BT_ASSERT_PRE_NON_NULL(message_iterator, "Created message iterator"); - BT_ASSERT_PRE_NON_NULL(port, "Input port"); + BT_ASSERT_PRE_NON_NULL_FROM_FUNC(api_func, "message-iterator-output", + message_iterator, "Created message iterator (output)"); + BT_ASSERT_PRE_NON_NULL_FROM_FUNC(api_func, "input-port", port, + "Input port"); comp = bt_port_borrow_component_inline(port); - BT_ASSERT_PRE(bt_port_is_connected(port), + BT_ASSERT_PRE_FROM_FUNC(api_func, "input-port-is-connected", + bt_port_is_connected(port), "Input port is not connected: %![port-]+p", port); - BT_ASSERT_PRE(comp, "Input port is not part of a component: %![port-]+p", + BT_ASSERT_PRE_FROM_FUNC(api_func, "input-port-has-component", + comp, "Input port is not part of a component: %![port-]+p", port); BT_ASSERT(port->connection); upstream_port = port->connection->upstream_port; BT_ASSERT(upstream_port); upstream_comp = bt_port_borrow_component_inline(upstream_port); BT_ASSERT(upstream_comp); - BT_ASSERT_PRE( + BT_ASSERT_PRE_FROM_FUNC(api_func, "graph-is-configured", bt_component_borrow_graph(upstream_comp)->config_state == BT_GRAPH_CONFIGURATION_STATE_PARTIALLY_CONFIGURED || bt_component_borrow_graph(upstream_comp)->config_state == @@ -335,6 +362,16 @@ int create_self_component_input_port_message_iterator( g_ptr_array_set_size(iterator->msgs, MSG_BATCH_SIZE); iterator->last_ns_from_origin = INT64_MIN; + +#ifdef BT_DEV_MODE + /* The per-stream state is only used for dev assertions right now. */ + iterator->per_stream_state = g_hash_table_new_full( + g_direct_hash, + g_direct_equal, + NULL, + g_free); +#endif + iterator->auto_seek.msgs = g_queue_new(); if (!iterator->auto_seek.msgs) { BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GQueue."); @@ -404,7 +441,9 @@ int create_self_component_input_port_message_iterator( (struct bt_self_component_port_output *) upstream_port); BT_LOGD("User method returned: status=%s", bt_common_func_status_string(iter_status)); - BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS(iter_status); + BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS( + "bt_message_iterator_class_initialize_method", + iter_status); if (iter_status != BT_FUNC_STATUS_OK) { BT_LIB_LOGW_APPEND_CAUSE( "Component input port message iterator initialization method failed: " @@ -448,6 +487,7 @@ end: return status; } +BT_EXPORT bt_message_iterator_create_from_message_iterator_status bt_message_iterator_create_from_message_iterator( struct bt_self_message_iterator *self_msg_iter, @@ -455,11 +495,12 @@ bt_message_iterator_create_from_message_iterator( struct bt_message_iterator **message_iterator) { BT_ASSERT_PRE_NO_ERROR(); - BT_ASSERT_PRE_NON_NULL(self_msg_iter, "Message iterator"); + BT_ASSERT_PRE_MSG_ITER_NON_NULL(self_msg_iter); return create_self_component_input_port_message_iterator(self_msg_iter, - input_port, message_iterator); + input_port, message_iterator, __func__); } +BT_EXPORT bt_message_iterator_create_from_sink_component_status bt_message_iterator_create_from_sink_component( struct bt_self_component_sink *self_comp, @@ -467,39 +508,44 @@ bt_message_iterator_create_from_sink_component( struct bt_message_iterator **message_iterator) { BT_ASSERT_PRE_NO_ERROR(); - BT_ASSERT_PRE_NON_NULL(self_comp, "Sink component"); + BT_ASSERT_PRE_NON_NULL("sink-component", self_comp, "Sink component"); return create_self_component_input_port_message_iterator(NULL, - input_port, message_iterator); + input_port, message_iterator, __func__); } +BT_EXPORT void *bt_self_message_iterator_get_data( const struct bt_self_message_iterator *self_iterator) { struct bt_message_iterator *iterator = (void *) self_iterator; - BT_ASSERT_PRE_DEV_NON_NULL(iterator, "Message iterator"); + BT_ASSERT_PRE_DEV_MSG_ITER_NON_NULL(iterator); return iterator->user_data; } +BT_EXPORT void bt_self_message_iterator_set_data( struct bt_self_message_iterator *self_iterator, void *data) { struct bt_message_iterator *iterator = (void *) self_iterator; - BT_ASSERT_PRE_DEV_NON_NULL(iterator, "Message iterator"); + BT_ASSERT_PRE_DEV_MSG_ITER_NON_NULL(iterator); iterator->user_data = data; BT_LIB_LOGD("Set message iterator's user data: " "%!+i, user-data-addr=%p", iterator, data); } +BT_EXPORT void bt_self_message_iterator_configuration_set_can_seek_forward( bt_self_message_iterator_configuration *config, bt_bool can_seek_forward) { - BT_ASSERT_PRE_NON_NULL(config, "Message iterator configuration"); - BT_ASSERT_PRE_DEV_HOT(config, "Message iterator configuration", ""); + BT_ASSERT_PRE_NON_NULL("message-iterator-configuration", config, + "Message iterator configuration"); + BT_ASSERT_PRE_DEV_HOT("message-iterator-configuration", config, + "Message iterator configuration", ""); config->can_seek_forward = can_seek_forward; } @@ -773,6 +819,151 @@ end: return result; } +#ifdef BT_DEV_MODE +static +const bt_stream *get_stream_from_msg(const struct bt_message *msg) +{ + struct bt_stream *stream; + + switch (msg->type) { + case BT_MESSAGE_TYPE_STREAM_BEGINNING: + case BT_MESSAGE_TYPE_STREAM_END: + { + struct bt_message_stream *msg_stream = + (struct bt_message_stream *) msg; + stream = msg_stream->stream; + break; + } + case BT_MESSAGE_TYPE_EVENT: + { + struct bt_message_event *msg_event = + (struct bt_message_event *) msg; + stream = msg_event->event->stream; + break; + } + case BT_MESSAGE_TYPE_PACKET_BEGINNING: + case BT_MESSAGE_TYPE_PACKET_END: + { + struct bt_message_packet *msg_packet = + (struct bt_message_packet *) msg; + stream = msg_packet->packet->stream; + break; + } + case BT_MESSAGE_TYPE_DISCARDED_EVENTS: + case BT_MESSAGE_TYPE_DISCARDED_PACKETS: + { + struct bt_message_discarded_items *msg_discarded = + (struct bt_message_discarded_items *) msg; + stream = msg_discarded->stream; + break; + } + case BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY: + stream = NULL; + break; + default: + bt_common_abort(); + } + + return stream; +} + +static +struct per_stream_state *get_per_stream_state( + struct bt_message_iterator *iterator, + const struct bt_stream *stream) +{ + struct per_stream_state *state = g_hash_table_lookup( + iterator->per_stream_state, stream); + + if (!state) { + state = g_new0(struct per_stream_state, 1); + g_hash_table_insert(iterator->per_stream_state, + (gpointer) stream, state); + } + + return state; +} +#endif + +#define NEXT_METHOD_NAME "bt_message_iterator_class_next_method" + +#ifdef BT_DEV_MODE +static +void assert_post_dev_expected_packet(struct bt_message_iterator *iterator, + const struct bt_message *msg) +{ + const bt_stream *stream = get_stream_from_msg(msg); + struct per_stream_state *state; + const bt_packet *actual_packet = NULL; + const bt_packet *expected_packet = NULL; + + if (!stream) { + goto end; + } + + state = get_per_stream_state(iterator, stream); + + switch (msg->type) { + case BT_MESSAGE_TYPE_EVENT: + { + const struct bt_message_event *msg_event = + (const struct bt_message_event *) msg; + + actual_packet = msg_event->event->packet; + expected_packet = state->cur_packet; + break; + } + case BT_MESSAGE_TYPE_PACKET_BEGINNING: + { + const struct bt_message_packet *msg_packet = + (const struct bt_message_packet *) msg; + + BT_ASSERT(!state->cur_packet); + state->cur_packet = msg_packet->packet; + break; + } + case BT_MESSAGE_TYPE_PACKET_END: + { + const struct bt_message_packet *msg_packet = + (const struct bt_message_packet *) msg; + + actual_packet = msg_packet->packet; + expected_packet = state->cur_packet; + BT_ASSERT(state->cur_packet); + state->cur_packet = NULL; + break; + } + default: + break; + } + + BT_ASSERT_POST_DEV(NEXT_METHOD_NAME, + "message-packet-is-expected", + actual_packet == expected_packet, + "Message's packet is not expected: %![stream-]s, %![iterator-]i, " + "%![message-]n, %![received-packet-]a, %![expected-packet-]a", + stream, iterator, msg, actual_packet, expected_packet); + +end: + return; +} + +static +void assert_post_dev_next( + struct bt_message_iterator *iterator, + bt_message_iterator_class_next_method_status status, + bt_message_array_const msgs, uint64_t msg_count) +{ + if (status == BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK) { + uint64_t i; + + for (i = 0; i < msg_count; i++) { + assert_post_dev_expected_packet(iterator, msgs[i]); + } + } +} +#endif + /* * Call the `next` method of the iterator. Do some validation on the returned * messages. @@ -793,17 +984,29 @@ call_iterator_next_method( bt_common_func_status_string(status), *user_count); if (status == BT_FUNC_STATUS_OK) { - BT_ASSERT_POST_DEV(clock_classes_are_compatible(iterator, msgs, *user_count), + BT_ASSERT_POST_DEV(NEXT_METHOD_NAME, + "message-clock-classes-are-compatible", + clock_classes_are_compatible(iterator, msgs, + *user_count), "Clocks are not compatible"); - BT_ASSERT_POST_DEV(clock_snapshots_are_monotonic(iterator, msgs, *user_count), + BT_ASSERT_POST_DEV(NEXT_METHOD_NAME, + "message-clock-snapshots-are-monotonic", + clock_snapshots_are_monotonic(iterator, msgs, + *user_count), "Clock snapshots are not monotonic"); } - BT_ASSERT_POST_DEV_NO_ERROR_IF_NO_ERROR_STATUS(status); +#ifdef BT_DEV_MODE + assert_post_dev_next(iterator, status, msgs, *user_count); +#endif + + BT_ASSERT_POST_DEV_NO_ERROR_IF_NO_ERROR_STATUS(NEXT_METHOD_NAME, + status); return status; } +BT_EXPORT enum bt_message_iterator_next_status bt_message_iterator_next( struct bt_message_iterator *iterator, @@ -812,16 +1015,18 @@ bt_message_iterator_next( enum bt_message_iterator_next_status status = BT_FUNC_STATUS_OK; BT_ASSERT_PRE_DEV_NO_ERROR(); - BT_ASSERT_PRE_DEV_NON_NULL(iterator, "Message iterator"); - BT_ASSERT_PRE_DEV_NON_NULL(msgs, "Message array (output)"); - BT_ASSERT_PRE_DEV_NON_NULL(user_count, "Message count (output)"); - BT_ASSERT_PRE_DEV(iterator->state == - BT_MESSAGE_ITERATOR_STATE_ACTIVE, + BT_ASSERT_PRE_DEV_MSG_ITER_NON_NULL(iterator); + BT_ASSERT_PRE_DEV_NON_NULL("message-array-output", msgs, + "Message array (output)"); + BT_ASSERT_PRE_DEV_NON_NULL("user-count-output", user_count, + "Message count (output)"); + BT_ASSERT_PRE_DEV("message-iterator-is-active", + iterator->state == BT_MESSAGE_ITERATOR_STATE_ACTIVE, "Message iterator's \"next\" called, but " "message iterator is in the wrong state: %!+i", iterator); BT_ASSERT_DBG(iterator->upstream_component); BT_ASSERT_DBG(iterator->upstream_component->class); - BT_ASSERT_PRE_DEV( + BT_ASSERT_PRE_DEV("graph-is-configured", bt_component_borrow_graph(iterator->upstream_component)->config_state != BT_GRAPH_CONFIGURATION_STATE_CONFIGURING, "Graph is not configured: %!+g", @@ -862,7 +1067,8 @@ bt_message_iterator_next( switch (status) { case BT_FUNC_STATUS_OK: - BT_ASSERT_POST_DEV(*user_count <= MSG_BATCH_SIZE, + BT_ASSERT_POST_DEV(NEXT_METHOD_NAME, "count-lteq-capacity", + *user_count <= MSG_BATCH_SIZE, "Invalid returned message count: greater than " "batch size: count=%" PRIu64 ", batch-size=%u", *user_count, MSG_BATCH_SIZE); @@ -883,34 +1089,41 @@ end: return status; } +BT_EXPORT struct bt_component * bt_message_iterator_borrow_component( struct bt_message_iterator *iterator) { - BT_ASSERT_PRE_DEV_NON_NULL(iterator, "Message iterator"); + BT_ASSERT_PRE_DEV_MSG_ITER_NON_NULL(iterator); return iterator->upstream_component; } +BT_EXPORT struct bt_self_component *bt_self_message_iterator_borrow_component( struct bt_self_message_iterator *self_iterator) { struct bt_message_iterator *iterator = (void *) self_iterator; - BT_ASSERT_PRE_DEV_NON_NULL(iterator, "Message iterator"); + BT_ASSERT_PRE_DEV_MSG_ITER_NON_NULL(iterator); return (void *) iterator->upstream_component; } +BT_EXPORT struct bt_self_component_port_output *bt_self_message_iterator_borrow_port( struct bt_self_message_iterator *self_iterator) { struct bt_message_iterator *iterator = (void *) self_iterator; - BT_ASSERT_PRE_DEV_NON_NULL(iterator, "Message iterator"); + BT_ASSERT_PRE_DEV_MSG_ITER_NON_NULL(iterator); return (void *) iterator->upstream_port; } +#define CAN_SEEK_NS_FROM_ORIGIN_METHOD_NAME \ + "bt_message_iterator_class_can_seek_ns_from_origin_method" + +BT_EXPORT enum bt_message_iterator_can_seek_ns_from_origin_status bt_message_iterator_can_seek_ns_from_origin( struct bt_message_iterator *iterator, @@ -919,10 +1132,10 @@ bt_message_iterator_can_seek_ns_from_origin( enum bt_message_iterator_can_seek_ns_from_origin_status status; BT_ASSERT_PRE_NO_ERROR(); - BT_ASSERT_PRE_NON_NULL(iterator, "Message iterator"); - BT_ASSERT_PRE_NON_NULL(can_seek, "Result (output)"); + BT_ASSERT_PRE_MSG_ITER_NON_NULL(iterator); + BT_ASSERT_PRE_RES_OUT_NON_NULL(can_seek); BT_ASSERT_PRE_ITER_HAS_STATE_TO_SEEK(iterator); - BT_ASSERT_PRE( + BT_ASSERT_PRE("graph-is-configured", bt_component_borrow_graph(iterator->upstream_component)->config_state != BT_GRAPH_CONFIGURATION_STATE_CONFIGURING, "Graph is not configured: %!+g", @@ -941,7 +1154,8 @@ bt_message_iterator_can_seek_ns_from_origin( status = (int) iterator->methods.can_seek_ns_from_origin(iterator, ns_from_origin, can_seek); - BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS(status); + BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS( + CAN_SEEK_NS_FROM_ORIGIN_METHOD_NAME, status); if (status != BT_FUNC_STATUS_OK) { BT_LIB_LOGW_APPEND_CAUSE( @@ -951,7 +1165,9 @@ bt_message_iterator_can_seek_ns_from_origin( goto end; } - BT_ASSERT_POST(*can_seek == BT_TRUE || *can_seek == BT_FALSE, + BT_ASSERT_POST(CAN_SEEK_NS_FROM_ORIGIN_METHOD_NAME, + "valid-return-value", + *can_seek == BT_TRUE || *can_seek == BT_FALSE, "Unexpected boolean value returned from user's \"can seek ns from origin\" method: val=%d, %![iter-]+i", *can_seek, iterator); @@ -982,6 +1198,10 @@ end: return status; } +#define CAN_SEEK_BEGINNING_METHOD_NAME \ + "bt_message_iterator_class_can_seek_beginning" + +BT_EXPORT enum bt_message_iterator_can_seek_beginning_status bt_message_iterator_can_seek_beginning( struct bt_message_iterator *iterator, @@ -990,10 +1210,10 @@ bt_message_iterator_can_seek_beginning( enum bt_message_iterator_can_seek_beginning_status status; BT_ASSERT_PRE_NO_ERROR(); - BT_ASSERT_PRE_NON_NULL(iterator, "Message iterator"); - BT_ASSERT_PRE_NON_NULL(can_seek, "Result (output)"); + BT_ASSERT_PRE_MSG_ITER_NON_NULL(iterator); + BT_ASSERT_PRE_RES_OUT_NON_NULL(can_seek); BT_ASSERT_PRE_ITER_HAS_STATE_TO_SEEK(iterator); - BT_ASSERT_PRE( + BT_ASSERT_PRE("graph-is-configured", bt_component_borrow_graph(iterator->upstream_component)->config_state != BT_GRAPH_CONFIGURATION_STATE_CONFIGURING, "Graph is not configured: %!+g", @@ -1008,13 +1228,15 @@ bt_message_iterator_can_seek_beginning( status = (int) iterator->methods.can_seek_beginning(iterator, can_seek); - BT_ASSERT_POST( + BT_ASSERT_POST(CAN_SEEK_BEGINNING_METHOD_NAME, + "valid-return-value", status != BT_FUNC_STATUS_OK || *can_seek == BT_TRUE || *can_seek == BT_FALSE, "Unexpected boolean value returned from user's \"can seek beginning\" method: val=%d, %![iter-]+i", *can_seek, iterator); - BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS(status); + BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS( + CAN_SEEK_BEGINNING_METHOD_NAME, status); } else { *can_seek = BT_FALSE; status = BT_FUNC_STATUS_OK; @@ -1076,21 +1298,25 @@ bool message_iterator_can_seek_beginning( return can_seek; } +#define SEEK_BEGINNING_METHOD_NAME \ + "bt_message_iterator_class_seek_beginning_method" + +BT_EXPORT enum bt_message_iterator_seek_beginning_status -bt_message_iterator_seek_beginning( - struct bt_message_iterator *iterator) +bt_message_iterator_seek_beginning(struct bt_message_iterator *iterator) { int status; BT_ASSERT_PRE_NO_ERROR(); - BT_ASSERT_PRE_NON_NULL(iterator, "Message iterator"); + BT_ASSERT_PRE_MSG_ITER_NON_NULL(iterator); BT_ASSERT_PRE_ITER_HAS_STATE_TO_SEEK(iterator); - BT_ASSERT_PRE( + BT_ASSERT_PRE("graph-is-configured", bt_component_borrow_graph(iterator->upstream_component)->config_state != BT_GRAPH_CONFIGURATION_STATE_CONFIGURING, "Graph is not configured: %!+g", bt_component_borrow_graph(iterator->upstream_component)); - BT_ASSERT_PRE(message_iterator_can_seek_beginning(iterator), + BT_ASSERT_PRE("can-seek-beginning", + message_iterator_can_seek_beginning(iterator), "Message iterator cannot seek beginning: %!+i", iterator); /* @@ -1105,13 +1331,15 @@ bt_message_iterator_seek_beginning( status = iterator->methods.seek_beginning(iterator); BT_LOGD("User method returned: status=%s", bt_common_func_status_string(status)); - BT_ASSERT_POST(status == BT_FUNC_STATUS_OK || + BT_ASSERT_POST(SEEK_BEGINNING_METHOD_NAME, "valid-status", + status == BT_FUNC_STATUS_OK || status == BT_FUNC_STATUS_ERROR || status == BT_FUNC_STATUS_MEMORY_ERROR || status == BT_FUNC_STATUS_AGAIN, "Unexpected status: %![iter-]+i, status=%s", iterator, bt_common_func_status_string(status)); - BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS(status); + BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS(SEEK_BEGINNING_METHOD_NAME, + status); if (status < 0) { BT_LIB_LOGW_APPEND_CAUSE( "Component input port message iterator's \"seek beginning\" method failed: " @@ -1119,15 +1347,18 @@ bt_message_iterator_seek_beginning( iterator, bt_common_func_status_string(status)); } + clear_per_stream_state(iterator); + set_iterator_state_after_seeking(iterator, status); return status; } +BT_EXPORT bt_bool bt_message_iterator_can_seek_forward( bt_message_iterator *iterator) { - BT_ASSERT_PRE_NON_NULL(iterator, "Message iterator"); + BT_ASSERT_PRE_MSG_ITER_NON_NULL(iterator); return iterator->config.can_seek_forward; } @@ -1225,7 +1456,9 @@ int auto_seek_handle_message( (const void *) msg; clk_snapshot = event_msg->default_cs; - BT_ASSERT_POST_DEV(clk_snapshot, + BT_ASSERT_POST_DEV(NEXT_METHOD_NAME, + "event-message-has-default-clock-snapshot", + clk_snapshot, "Event message has no default clock snapshot: %!+n", event_msg); break; @@ -1245,8 +1478,20 @@ int auto_seek_handle_message( const struct bt_message_packet *packet_msg = (const void *) msg; + if (msg->type == BT_MESSAGE_TYPE_PACKET_BEGINNING + && !packet_msg->packet->stream->class->packets_have_beginning_default_clock_snapshot) { + goto skip_msg; + } + + if (msg->type == BT_MESSAGE_TYPE_PACKET_END + && !packet_msg->packet->stream->class->packets_have_end_default_clock_snapshot) { + goto skip_msg; + } + clk_snapshot = packet_msg->default_cs; - BT_ASSERT_POST_DEV(clk_snapshot, + BT_ASSERT_POST_DEV(NEXT_METHOD_NAME, + "packet-message-has-default-clock-snapshot", + clk_snapshot, "Packet message has no default clock snapshot: %!+n", packet_msg); break; @@ -1257,8 +1502,20 @@ int auto_seek_handle_message( struct bt_message_discarded_items *msg_disc_items = (void *) msg; - BT_ASSERT_POST_DEV(msg_disc_items->default_begin_cs && - msg_disc_items->default_end_cs, + if (msg->type == BT_MESSAGE_TYPE_DISCARDED_EVENTS && + !msg_disc_items->stream->class->discarded_events_have_default_clock_snapshots) { + goto skip_msg; + } + + if (msg->type == BT_MESSAGE_TYPE_DISCARDED_PACKETS && + !msg_disc_items->stream->class->discarded_packets_have_default_clock_snapshots) { + goto skip_msg; + } + + BT_ASSERT_POST_DEV(NEXT_METHOD_NAME, + "discarded-events-packets-message-has-default-clock-snapshot", + msg_disc_items->default_begin_cs && + msg_disc_items->default_end_cs, "Discarded events/packets message has no default clock snapshots: %!+n", msg_disc_items); ret = bt_clock_snapshot_get_ns_from_origin( @@ -1525,7 +1782,9 @@ int find_message_ge_ns_from_origin( switch (status) { case BT_FUNC_STATUS_OK: - BT_ASSERT_POST_DEV(user_count <= MSG_BATCH_SIZE, + BT_ASSERT_POST_DEV(NEXT_METHOD_NAME, + "count-lteq-capacity", + user_count <= MSG_BATCH_SIZE, "Invalid returned message count: greater than " "batch size: count=%" PRIu64 ", batch-size=%u", user_count, MSG_BATCH_SIZE); @@ -1638,6 +1897,11 @@ bool message_iterator_can_seek_ns_from_origin( return can_seek; } +#define SEEK_NS_FROM_ORIGIN_METHOD_NAME \ + "bt_message_iterator_class_seek_ns_from_origin_method" + + +BT_EXPORT enum bt_message_iterator_seek_ns_from_origin_status bt_message_iterator_seek_ns_from_origin( struct bt_message_iterator *iterator, @@ -1648,15 +1912,15 @@ bt_message_iterator_seek_ns_from_origin( bt_bool can_seek_by_itself; BT_ASSERT_PRE_NO_ERROR(); - BT_ASSERT_PRE_NON_NULL(iterator, "Message iterator"); + BT_ASSERT_PRE_MSG_ITER_NON_NULL(iterator); BT_ASSERT_PRE_ITER_HAS_STATE_TO_SEEK(iterator); - BT_ASSERT_PRE( + BT_ASSERT_PRE("graph-is-configured", bt_component_borrow_graph(iterator->upstream_component)->config_state != BT_GRAPH_CONFIGURATION_STATE_CONFIGURING, "Graph is not configured: %!+g", bt_component_borrow_graph(iterator->upstream_component)); /* The iterator must be able to seek ns from origin one way or another. */ - BT_ASSERT_PRE( + BT_ASSERT_PRE("can-seek-ns-from-origin", message_iterator_can_seek_ns_from_origin(iterator, ns_from_origin), "Message iterator cannot seek nanoseconds from origin: %!+i, " "ns-from-origin=%" PRId64, iterator, ns_from_origin); @@ -1694,13 +1958,15 @@ bt_message_iterator_seek_ns_from_origin( ns_from_origin); BT_LOGD("User method returned: status=%s", bt_common_func_status_string(status)); - BT_ASSERT_POST(status == BT_FUNC_STATUS_OK || + BT_ASSERT_POST(SEEK_NS_FROM_ORIGIN_METHOD_NAME, "valid-status", + status == BT_FUNC_STATUS_OK || status == BT_FUNC_STATUS_ERROR || status == BT_FUNC_STATUS_MEMORY_ERROR || status == BT_FUNC_STATUS_AGAIN, "Unexpected status: %![iter-]+i, status=%s", iterator, bt_common_func_status_string(status)); - BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS(status); + BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS( + SEEK_NS_FROM_ORIGIN_METHOD_NAME, status); if (status < 0) { BT_LIB_LOGW_APPEND_CAUSE( "Component input port message iterator's \"seek nanoseconds from origin\" method failed: " @@ -1726,7 +1992,8 @@ bt_message_iterator_seek_ns_from_origin( status = iterator->methods.seek_beginning(iterator); BT_LOGD("User method returned: status=%s", bt_common_func_status_string(status)); - BT_ASSERT_POST(status == BT_FUNC_STATUS_OK || + BT_ASSERT_POST(SEEK_BEGINNING_METHOD_NAME, "valid-status", + status == BT_FUNC_STATUS_OK || status == BT_FUNC_STATUS_ERROR || status == BT_FUNC_STATUS_MEMORY_ERROR || status == BT_FUNC_STATUS_AGAIN, @@ -1739,6 +2006,8 @@ bt_message_iterator_seek_ns_from_origin( iterator, bt_common_func_status_string(status)); } + clear_per_stream_state(iterator); + switch (status) { case BT_FUNC_STATUS_OK: break; @@ -1895,6 +2164,8 @@ bt_message_iterator_seek_ns_from_origin( } } + clear_per_stream_state(iterator); + /* * The following messages returned by the next method (including * post_auto_seek_next) must be after (or at) `ns_from_origin`. @@ -1911,22 +2182,25 @@ end: return status; } +BT_EXPORT bt_bool bt_self_message_iterator_is_interrupted( const struct bt_self_message_iterator *self_msg_iter) { const struct bt_message_iterator *iterator = (const void *) self_msg_iter; - BT_ASSERT_PRE_NON_NULL(iterator, "Message iterator"); + BT_ASSERT_PRE_MSG_ITER_NON_NULL(iterator); return (bt_bool) bt_graph_is_interrupted(iterator->graph); } +BT_EXPORT void bt_message_iterator_get_ref( const struct bt_message_iterator *iterator) { bt_object_get_ref(iterator); } +BT_EXPORT void bt_message_iterator_put_ref( const struct bt_message_iterator *iterator) {