X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fiterator.c;h=121e4bd9a8ed4ca70eb4d6971b83d0d9cd97ea27;hb=498e7994d60bd0e9f63c3d5c0fd00eec77ba7c34;hp=21cd6eb80d9c802cc4d9314d32985f95d1bc3830;hpb=73ea076192095461cdf0e1ef81f703eae95b22ae;p=babeltrace.git diff --git a/src/lib/graph/iterator.c b/src/lib/graph/iterator.c index 21cd6eb8..121e4bd9 100644 --- a/src/lib/graph/iterator.c +++ b/src/lib/graph/iterator.c @@ -60,6 +60,7 @@ #include "lib/assert-post.h" #include #include +#include #include #include "component-class.h" @@ -95,7 +96,7 @@ void set_self_comp_port_input_msg_iterator_state( struct bt_self_component_port_input_message_iterator *iterator, enum bt_self_component_port_input_message_iterator_state state) { - BT_ASSERT(iterator); + BT_ASSERT_DBG(iterator); BT_LIB_LOGD("Updating message iterator's state: new-state=%s", bt_self_component_port_input_message_iterator_state_string(state)); iterator->state = state; @@ -137,7 +138,7 @@ void bt_self_component_port_input_message_iterator_destroy(struct bt_object *obj if (iterator->auto_seek.msgs) { while (!g_queue_is_empty(iterator->auto_seek.msgs)) { - bt_object_put_no_null_check( + bt_object_put_ref_no_null_check( g_queue_pop_tail(iterator->auto_seek.msgs)); } @@ -190,7 +191,7 @@ void bt_self_component_port_input_message_iterator_try_finalize( /* Finalizing */ BT_LIB_LOGF("Message iterator is already being finalized: " "%!+i", iterator); - abort(); + bt_common_abort(); default: break; } @@ -221,7 +222,7 @@ void bt_self_component_port_input_message_iterator_try_finalize( } default: /* Unreachable */ - abort(); + bt_common_abort(); } if (method) { @@ -273,28 +274,33 @@ void bt_self_component_port_input_message_iterator_set_connection( } static -bt_bool can_seek_ns_from_origin_true( +enum bt_message_iterator_can_seek_beginning_status can_seek_ns_from_origin_true( struct bt_self_component_port_input_message_iterator *iterator, - int64_t ns_from_origin) + int64_t ns_from_origin, bt_bool *can_seek) { - return BT_TRUE; + *can_seek = BT_TRUE; + + return BT_FUNC_STATUS_OK; } static -bt_bool can_seek_beginning_true( - struct bt_self_component_port_input_message_iterator *iterator) +enum bt_message_iterator_can_seek_beginning_status can_seek_beginning_true( + struct bt_self_component_port_input_message_iterator *iterator, + bt_bool *can_seek) { - return BT_TRUE; + *can_seek = BT_TRUE; + + return BT_FUNC_STATUS_OK; } static -struct bt_self_component_port_input_message_iterator * -create_self_component_input_port_message_iterator( +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_self_component_port_input *self_port, + struct bt_self_component_port_input_message_iterator **message_iterator) { - typedef enum bt_component_class_message_iterator_init_method_status (*init_method_t)( - void *, void *, void *); + typedef enum bt_component_class_message_iterator_initialize_method_status (*init_method_t)( + void *, void *, void *, void *); init_method_t init_method = NULL; struct bt_self_component_port_input_message_iterator *iterator = @@ -306,7 +312,9 @@ create_self_component_input_port_message_iterator( struct bt_component *comp; struct bt_component *upstream_comp; struct bt_component_class *upstream_comp_cls; + int status; + BT_ASSERT_PRE_NON_NULL(message_iterator, "Created message iterator"); BT_ASSERT_PRE_NON_NULL(port, "Input port"); comp = bt_port_borrow_component_inline(port); BT_ASSERT_PRE(bt_port_is_connected(port), @@ -338,6 +346,7 @@ create_self_component_input_port_message_iterator( BT_LIB_LOGE_APPEND_CAUSE( "Failed to allocate one self component input port " "message iterator."); + status = BT_FUNC_STATUS_MEMORY_ERROR; goto error; } @@ -346,6 +355,7 @@ create_self_component_input_port_message_iterator( iterator->msgs = g_ptr_array_new(); if (!iterator->msgs) { BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GPtrArray."); + status = BT_FUNC_STATUS_MEMORY_ERROR; goto error; } @@ -354,12 +364,14 @@ create_self_component_input_port_message_iterator( iterator->auto_seek.msgs = g_queue_new(); if (!iterator->auto_seek.msgs) { BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GQueue."); + status = BT_FUNC_STATUS_MEMORY_ERROR; goto error; } iterator->upstream_msg_iters = g_ptr_array_new(); if (!iterator->upstream_msg_iters) { BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GPtrArray."); + status = BT_FUNC_STATUS_MEMORY_ERROR; goto error; } @@ -416,7 +428,7 @@ create_self_component_input_port_message_iterator( break; } default: - abort(); + bt_common_abort(); } if (iterator->methods.seek_ns_from_origin && @@ -429,7 +441,7 @@ create_self_component_input_port_message_iterator( if (iterator->methods.seek_beginning && !iterator->methods.can_seek_beginning) { iterator->methods.can_seek_beginning = - (bt_self_component_port_input_message_iterator_seek_beginning_method) + (bt_self_component_port_input_message_iterator_can_seek_beginning_method) can_seek_beginning_true; } @@ -440,7 +452,7 @@ create_self_component_input_port_message_iterator( (void *) upstream_comp_cls; init_method = - (init_method_t) src_comp_cls->methods.msg_iter_init; + (init_method_t) src_comp_cls->methods.msg_iter_initialize; break; } case BT_COMPONENT_CLASS_TYPE_FILTER: @@ -449,19 +461,19 @@ create_self_component_input_port_message_iterator( (void *) upstream_comp_cls; init_method = - (init_method_t) flt_comp_cls->methods.msg_iter_init; + (init_method_t) flt_comp_cls->methods.msg_iter_initialize; break; } default: /* Unreachable */ - abort(); + bt_common_abort(); } if (init_method) { - enum bt_component_class_message_iterator_init_method_status iter_status; + enum bt_component_class_message_iterator_initialize_method_status iter_status; BT_LIB_LOGD("Calling user's initialization method: %!+i", iterator); - iter_status = init_method(iterator, upstream_comp, + iter_status = init_method(iterator, &iterator->config, upstream_comp, upstream_port); BT_LOGD("User method returned: status=%s", bt_common_func_status_string(iter_status)); @@ -471,8 +483,11 @@ create_self_component_input_port_message_iterator( "%![iter-]+i, status=%s", iterator, bt_common_func_status_string(iter_status)); + status = iter_status; goto error; } + + iterator->config.frozen = true; } if (downstream_msg_iter) { @@ -493,33 +508,38 @@ create_self_component_input_port_message_iterator( BT_LIB_LOGI("Created message iterator on self component input port: " "%![up-port-]+p, %![up-comp-]+c, %![iter-]+i", upstream_port, upstream_comp, iterator); + + *message_iterator = iterator; + status = BT_FUNC_STATUS_OK; goto end; error: BT_OBJECT_PUT_REF_AND_RESET(iterator); end: - return iterator; + return status; } -struct bt_self_component_port_input_message_iterator * +bt_self_component_port_input_message_iterator_create_from_message_iterator_status bt_self_component_port_input_message_iterator_create_from_message_iterator( struct bt_self_message_iterator *self_msg_iter, - struct bt_self_component_port_input *input_port) + struct bt_self_component_port_input *input_port, + struct bt_self_component_port_input_message_iterator **message_iterator) { BT_ASSERT_PRE_NON_NULL(self_msg_iter, "Message iterator"); return create_self_component_input_port_message_iterator(self_msg_iter, - input_port); + input_port, message_iterator); } -struct bt_self_component_port_input_message_iterator * +bt_self_component_port_input_message_iterator_create_from_sink_component_status bt_self_component_port_input_message_iterator_create_from_sink_component( struct bt_self_component_sink *self_comp, - struct bt_self_component_port_input *input_port) + struct bt_self_component_port_input *input_port, + struct bt_self_component_port_input_message_iterator **message_iterator) { BT_ASSERT_PRE_NON_NULL(self_comp, "Sink component"); return create_self_component_input_port_message_iterator(NULL, - input_port); + input_port, message_iterator); } void *bt_self_message_iterator_get_data( @@ -544,6 +564,16 @@ void bt_self_message_iterator_set_data( "%!+i, user-data-addr=%p", iterator, data); } +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", ""); + + config->can_seek_forward = can_seek_forward; +} + /* * Validate that the default clock snapshot in `msg` doesn't make us go back in * time. @@ -819,7 +849,7 @@ call_iterator_next_method( { enum bt_component_class_message_iterator_next_method_status status; - BT_ASSERT(iterator->methods.next); + BT_ASSERT_DBG(iterator->methods.next); BT_LOGD_STR("Calling user's \"next\" method."); status = iterator->methods.next(iterator, msgs, capacity, user_count); BT_LOGD("User method returned: status=%s, msg-count=%" PRIu64, @@ -849,8 +879,8 @@ bt_self_component_port_input_message_iterator_next( BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ACTIVE, "Message iterator's \"next\" called, but " "message iterator is in the wrong state: %!+i", iterator); - BT_ASSERT(iterator->upstream_component); - BT_ASSERT(iterator->upstream_component->class); + BT_ASSERT_DBG(iterator->upstream_component); + BT_ASSERT_DBG(iterator->upstream_component->class); BT_ASSERT_PRE_DEV( bt_component_borrow_graph(iterator->upstream_component)->config_state != BT_GRAPH_CONFIGURATION_STATE_CONFIGURING, @@ -887,7 +917,7 @@ bt_self_component_port_input_message_iterator_next( * For the same reason, there is no way that this iterator could * have seeked (cannot seek a self message iterator). */ - BT_ASSERT(iterator->state == + BT_ASSERT_DBG(iterator->state == BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ACTIVE); switch (status) { @@ -906,7 +936,7 @@ bt_self_component_port_input_message_iterator_next( goto end; default: /* Unknown non-error status */ - abort(); + bt_common_abort(); } end: @@ -921,14 +951,6 @@ bt_self_component_port_input_message_iterator_borrow_component( return iterator->upstream_component; } -const struct bt_component * -bt_self_component_port_input_message_iterator_borrow_component_const( - const struct bt_self_component_port_input_message_iterator *iterator) -{ - BT_ASSERT_PRE_DEV_NON_NULL(iterator, "Message iterator"); - return iterator->upstream_component; -} - struct bt_self_component *bt_self_message_iterator_borrow_component( struct bt_self_message_iterator *self_iterator) { @@ -939,7 +961,7 @@ struct bt_self_component *bt_self_message_iterator_borrow_component( return (void *) iterator->upstream_component; } -struct bt_self_port_output *bt_self_message_iterator_borrow_port( +struct bt_self_component_port_output *bt_self_message_iterator_borrow_port( struct bt_self_message_iterator *self_iterator) { struct bt_self_component_port_input_message_iterator *iterator = @@ -949,13 +971,15 @@ struct bt_self_port_output *bt_self_message_iterator_borrow_port( return (void *) iterator->upstream_port; } -bt_bool bt_self_component_port_input_message_iterator_can_seek_ns_from_origin( +enum bt_message_iterator_can_seek_ns_from_origin_status +bt_self_component_port_input_message_iterator_can_seek_ns_from_origin( struct bt_self_component_port_input_message_iterator *iterator, - int64_t ns_from_origin) + int64_t ns_from_origin, bt_bool *can_seek) { - bt_bool can = BT_FALSE; + enum bt_message_iterator_can_seek_ns_from_origin_status status; BT_ASSERT_PRE_NON_NULL(iterator, "Message iterator"); + BT_ASSERT_PRE_NON_NULL(can_seek, "Result (output)"); BT_ASSERT_PRE_ITER_HAS_STATE_TO_SEEK(iterator); BT_ASSERT_PRE( bt_component_borrow_graph(iterator->upstream_component)->config_state != @@ -964,29 +988,66 @@ bt_bool bt_self_component_port_input_message_iterator_can_seek_ns_from_origin( bt_component_borrow_graph(iterator->upstream_component)); if (iterator->methods.can_seek_ns_from_origin) { - can = iterator->methods.can_seek_ns_from_origin(iterator, - ns_from_origin); - goto end; + /* + * Initialize to an invalid value, so we can post-assert that + * the method returned a valid value. + */ + *can_seek = -1; + + BT_LIB_LOGD("Calling user's \"can seek nanoseconds from origin\" method: %!+i", + iterator); + + status = (int) iterator->methods.can_seek_ns_from_origin(iterator, + ns_from_origin, can_seek); + + if (status != BT_FUNC_STATUS_OK) { + BT_LIB_LOGW_APPEND_CAUSE( + "Component input port message iterator's \"can seek nanoseconds from origin\" method failed: " + "%![iter-]+i, status=%s", + iterator, bt_common_func_status_string(status)); + goto end; + } + + BT_ASSERT_POST(*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); + + BT_LIB_LOGD( + "User's \"can seek nanoseconds from origin\" returned successfully: " + "%![iter-]+i, can-seek=%d", + iterator, *can_seek); + + if (*can_seek) { + goto end; + } } /* - * Automatic seeking fall back: if we can seek to the beginning, - * then we can automatically seek to any message. + * Automatic seeking fall back: if we can seek to the beginning and the + * iterator supports forward seeking then we can automatically seek to + * any timestamp. */ - if (iterator->methods.can_seek_beginning) { - can = iterator->methods.can_seek_beginning(iterator); + status = (int) bt_self_component_port_input_message_iterator_can_seek_beginning( + iterator, can_seek); + if (status != BT_FUNC_STATUS_OK) { + goto end; } + *can_seek = *can_seek && iterator->config.can_seek_forward; + end: - return can; + return status; } -bt_bool bt_self_component_port_input_message_iterator_can_seek_beginning( - struct bt_self_component_port_input_message_iterator *iterator) +enum bt_message_iterator_can_seek_beginning_status +bt_self_component_port_input_message_iterator_can_seek_beginning( + struct bt_self_component_port_input_message_iterator *iterator, + bt_bool *can_seek) { - bt_bool can = BT_FALSE; + enum bt_message_iterator_can_seek_beginning_status status; BT_ASSERT_PRE_NON_NULL(iterator, "Message iterator"); + BT_ASSERT_PRE_NON_NULL(can_seek, "Result (output)"); BT_ASSERT_PRE_ITER_HAS_STATE_TO_SEEK(iterator); BT_ASSERT_PRE( bt_component_borrow_graph(iterator->upstream_component)->config_state != @@ -995,10 +1056,26 @@ bt_bool bt_self_component_port_input_message_iterator_can_seek_beginning( bt_component_borrow_graph(iterator->upstream_component)); if (iterator->methods.can_seek_beginning) { - can = iterator->methods.can_seek_beginning(iterator); + /* + * Initialize to an invalid value, so we can post-assert that + * the method returned a valid value. + */ + *can_seek = -1; + + status = (int) iterator->methods.can_seek_beginning(iterator, can_seek); + + BT_ASSERT_POST( + 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); + } else { + *can_seek = BT_FALSE; + status = BT_FUNC_STATUS_OK; } - return can; + return status; } static inline @@ -1024,7 +1101,7 @@ void set_iterator_state_after_seeking( new_state = BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ENDED; break; default: - abort(); + bt_common_abort(); } set_self_comp_port_input_msg_iterator_state(iterator, new_state); @@ -1038,6 +1115,22 @@ void reset_iterator_expectations( iterator->clock_expectation.type = CLOCK_EXPECTATION_UNSET; } +static +bool message_iterator_can_seek_beginning( + struct bt_self_component_port_input_message_iterator *iterator) +{ + enum bt_message_iterator_can_seek_beginning_status status; + bt_bool can_seek; + + status = bt_self_component_port_input_message_iterator_can_seek_beginning( + iterator, &can_seek); + if (status != BT_FUNC_STATUS_OK) { + can_seek = BT_FALSE; + } + + return can_seek; +} + enum bt_message_iterator_seek_beginning_status bt_self_component_port_input_message_iterator_seek_beginning( struct bt_self_component_port_input_message_iterator *iterator) @@ -1051,9 +1144,7 @@ bt_self_component_port_input_message_iterator_seek_beginning( BT_GRAPH_CONFIGURATION_STATE_CONFIGURING, "Graph is not configured: %!+g", bt_component_borrow_graph(iterator->upstream_component)); - BT_ASSERT_PRE( - bt_self_component_port_input_message_iterator_can_seek_beginning( - iterator), + BT_ASSERT_PRE(message_iterator_can_seek_beginning(iterator), "Message iterator cannot seek beginning: %!+i", iterator); /* @@ -1085,6 +1176,15 @@ bt_self_component_port_input_message_iterator_seek_beginning( return status; } +bt_bool +bt_self_component_port_input_message_iterator_can_seek_forward( + bt_self_component_port_input_message_iterator *iterator) +{ + BT_ASSERT_PRE_NON_NULL(iterator, "Message iterator"); + + return iterator->config.can_seek_forward; +} + /* * Structure used to record the state of a given stream during the fast-forward * phase of an auto-seek. @@ -1168,8 +1268,8 @@ int auto_seek_handle_message( const struct bt_clock_snapshot *clk_snapshot = NULL; int ret; - BT_ASSERT(msg); - BT_ASSERT(got_first); + BT_ASSERT_DBG(msg); + BT_ASSERT_DBG(got_first); switch (msg->type) { case BT_MESSAGE_TYPE_EVENT: @@ -1189,7 +1289,7 @@ int auto_seek_handle_message( (const void *) msg; clk_snapshot = inactivity_msg->default_cs; - BT_ASSERT(clk_snapshot); + BT_ASSERT_DBG(clk_snapshot); break; } case BT_MESSAGE_TYPE_PACKET_BEGINNING: @@ -1285,10 +1385,10 @@ int auto_seek_handle_message( break; } default: - abort(); + bt_common_abort(); } - BT_ASSERT(clk_snapshot); + BT_ASSERT_DBG(clk_snapshot); ret = bt_clock_snapshot_get_ns_from_origin(clk_snapshot, &msg_ns_from_origin); if (ret) { @@ -1322,7 +1422,7 @@ skip_msg: stream_state->seen_clock_snapshot = true; } - BT_ASSERT(!bt_g_hash_table_contains(stream_states, stream_msg->stream)); + BT_ASSERT_DBG(!bt_g_hash_table_contains(stream_states, stream_msg->stream)); g_hash_table_insert(stream_states, stream_msg->stream, stream_state); break; } @@ -1334,11 +1434,10 @@ skip_msg: /* Update stream's state: packet began. */ stream_state = g_hash_table_lookup(stream_states, packet_msg->packet->stream); - BT_ASSERT(stream_state); - - BT_ASSERT(stream_state->state == AUTO_SEEK_STREAM_STATE_STREAM_BEGAN); + BT_ASSERT_DBG(stream_state); + BT_ASSERT_DBG(stream_state->state == AUTO_SEEK_STREAM_STATE_STREAM_BEGAN); stream_state->state = AUTO_SEEK_STREAM_STATE_PACKET_BEGAN; - BT_ASSERT(!stream_state->packet); + BT_ASSERT_DBG(!stream_state->packet); stream_state->packet = packet_msg->packet; if (packet_msg->packet->stream->class->packets_have_beginning_default_clock_snapshot) { @@ -1354,7 +1453,7 @@ skip_msg: stream_state = g_hash_table_lookup(stream_states, event_msg->event->packet->stream); - BT_ASSERT(stream_state); + BT_ASSERT_DBG(stream_state); // HELPME: are we sure that event messages have clock snapshots at this point? stream_state->seen_clock_snapshot = true; @@ -1369,11 +1468,10 @@ skip_msg: /* Update stream's state: packet ended. */ stream_state = g_hash_table_lookup(stream_states, packet_msg->packet->stream); - BT_ASSERT(stream_state); - - BT_ASSERT(stream_state->state == AUTO_SEEK_STREAM_STATE_PACKET_BEGAN); + BT_ASSERT_DBG(stream_state); + BT_ASSERT_DBG(stream_state->state == AUTO_SEEK_STREAM_STATE_PACKET_BEGAN); stream_state->state = AUTO_SEEK_STREAM_STATE_STREAM_BEGAN; - BT_ASSERT(stream_state->packet); + BT_ASSERT_DBG(stream_state->packet); stream_state->packet = NULL; if (packet_msg->packet->stream->class->packets_have_end_default_clock_snapshot) { @@ -1388,9 +1486,9 @@ skip_msg: struct auto_seek_stream_state *stream_state; stream_state = g_hash_table_lookup(stream_states, stream_msg->stream); - BT_ASSERT(stream_state); - BT_ASSERT(stream_state->state == AUTO_SEEK_STREAM_STATE_STREAM_BEGAN); - BT_ASSERT(!stream_state->packet); + BT_ASSERT_DBG(stream_state); + BT_ASSERT_DBG(stream_state->state == AUTO_SEEK_STREAM_STATE_STREAM_BEGAN); + BT_ASSERT_DBG(!stream_state->packet); /* Update stream's state: this stream doesn't exist anymore. */ g_hash_table_remove(stream_states, stream_msg->stream); @@ -1404,7 +1502,7 @@ skip_msg: struct auto_seek_stream_state *stream_state; stream_state = g_hash_table_lookup(stream_states, discarded_msg->stream); - BT_ASSERT(stream_state); + BT_ASSERT_DBG(stream_state); if ((msg->type == BT_MESSAGE_TYPE_DISCARDED_EVENTS && discarded_msg->stream->class->discarded_events_have_default_clock_snapshots) || (msg->type == BT_MESSAGE_TYPE_DISCARDED_PACKETS && discarded_msg->stream->class->discarded_packets_have_default_clock_snapshots)) { @@ -1417,7 +1515,7 @@ skip_msg: break; } - bt_object_put_no_null_check(msg); + bt_object_put_ref_no_null_check(msg); msg = NULL; goto end; @@ -1426,7 +1524,7 @@ push_msg: msg = NULL; end: - BT_ASSERT(!msg || status != BT_FUNC_STATUS_OK); + BT_ASSERT_DBG(!msg || status != BT_FUNC_STATUS_OK); return status; } @@ -1435,7 +1533,7 @@ int find_message_ge_ns_from_origin( struct bt_self_component_port_input_message_iterator *iterator, int64_t ns_from_origin, GHashTable *stream_states) { - int status; + int status = BT_FUNC_STATUS_OK; enum bt_self_component_port_input_message_iterator_state init_state = iterator->state; const struct bt_message *messages[MSG_BATCH_SIZE]; @@ -1443,7 +1541,7 @@ int find_message_ge_ns_from_origin( uint64_t i; bool got_first = false; - BT_ASSERT(iterator); + BT_ASSERT_DBG(iterator); memset(&messages[0], 0, sizeof(messages[0]) * MSG_BATCH_SIZE); /* @@ -1453,7 +1551,7 @@ int find_message_ge_ns_from_origin( set_self_comp_port_input_msg_iterator_state(iterator, BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ACTIVE); - BT_ASSERT(iterator->methods.next); + BT_ASSERT_DBG(iterator->methods.next); while (!got_first) { /* @@ -1475,7 +1573,7 @@ int find_message_ge_ns_from_origin( * The user's "next" method must not do any action which * would change the iterator's state. */ - BT_ASSERT(iterator->state == + BT_ASSERT_DBG(iterator->state == BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ACTIVE); switch (status) { @@ -1491,7 +1589,7 @@ int find_message_ge_ns_from_origin( case BT_FUNC_STATUS_END: goto end; default: - abort(); + bt_common_abort(); } for (i = 0; i < user_count; i++) { @@ -1517,7 +1615,7 @@ int find_message_ge_ns_from_origin( end: for (i = 0; i < user_count; i++) { if (messages[i]) { - bt_object_put_no_null_check(messages[i]); + bt_object_put_ref_no_null_check(messages[i]); } } @@ -1576,6 +1674,22 @@ int clock_raw_value_from_ns_from_origin(const bt_clock_class *clock_class, cc_offset_cycles, cc_freq, ns_from_origin, raw_value); } +static +bool message_iterator_can_seek_ns_from_origin( + struct bt_self_component_port_input_message_iterator *iterator, + int64_t ns_from_origin) +{ + enum bt_message_iterator_can_seek_ns_from_origin_status status; + bt_bool can_seek; + + status = bt_self_component_port_input_message_iterator_can_seek_ns_from_origin( + iterator, ns_from_origin, &can_seek); + if (status != BT_FUNC_STATUS_OK) { + can_seek = BT_FALSE; + } + + return can_seek; +} enum bt_message_iterator_seek_ns_from_origin_status bt_self_component_port_input_message_iterator_seek_ns_from_origin( @@ -1584,6 +1698,7 @@ bt_self_component_port_input_message_iterator_seek_ns_from_origin( { int status; GHashTable *stream_states = NULL; + bt_bool can_seek_by_itself; BT_ASSERT_PRE_NON_NULL(iterator, "Message iterator"); BT_ASSERT_PRE_ITER_HAS_STATE_TO_SEEK(iterator); @@ -1592,9 +1707,9 @@ bt_self_component_port_input_message_iterator_seek_ns_from_origin( 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_self_component_port_input_message_iterator_can_seek_ns_from_origin( - iterator, 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); set_self_comp_port_input_msg_iterator_state(iterator, @@ -1606,8 +1721,25 @@ bt_self_component_port_input_message_iterator_seek_ns_from_origin( */ reset_iterator_expectations(iterator); - if (iterator->methods.seek_ns_from_origin) { + /* Check if the iterator can seek by itself. If not we'll use autoseek. */ + if (iterator->methods.can_seek_ns_from_origin) { + bt_component_class_message_iterator_can_seek_ns_from_origin_method_status + can_seek_status; + + can_seek_status = + iterator->methods.can_seek_ns_from_origin( + iterator, ns_from_origin, &can_seek_by_itself); + if (can_seek_status != BT_FUNC_STATUS_OK) { + status = can_seek_status; + goto end; + } + } else { + can_seek_by_itself = false; + } + + if (can_seek_by_itself) { /* The iterator knows how to seek to a particular time, let it handle this. */ + BT_ASSERT(iterator->methods.seek_ns_from_origin); BT_LIB_LOGD("Calling user's \"seek nanoseconds from origin\" method: " "%![iter-]+i, ns=%" PRId64, iterator, ns_from_origin); status = iterator->methods.seek_ns_from_origin(iterator, @@ -1628,10 +1760,18 @@ bt_self_component_port_input_message_iterator_seek_ns_from_origin( } } else { /* - * The iterator doesn't know how to seek to a particular time. We will - * seek to the beginning and fast forward to the right place. + * The iterator doesn't know how to seek by itself to a + * particular time. We will seek to the beginning and fast + * forward to the right place. */ - BT_ASSERT(iterator->methods.can_seek_beginning(iterator)); + enum bt_component_class_message_iterator_can_seek_beginning_method_status + can_seek_status; + bt_bool can_seek_beginning; + + can_seek_status = iterator->methods.can_seek_beginning(iterator, + &can_seek_beginning); + BT_ASSERT(can_seek_status == BT_FUNC_STATUS_OK); + BT_ASSERT(can_seek_beginning); BT_ASSERT(iterator->methods.seek_beginning); BT_LIB_LOGD("Calling user's \"seek beginning\" method: %!+i", iterator); @@ -1659,7 +1799,7 @@ bt_self_component_port_input_message_iterator_seek_ns_from_origin( case BT_FUNC_STATUS_AGAIN: goto end; default: - abort(); + bt_common_abort(); } /* @@ -1670,7 +1810,7 @@ bt_self_component_port_input_message_iterator_seek_ns_from_origin( * message queue. */ while (!g_queue_is_empty(iterator->auto_seek.msgs)) { - bt_object_put_no_null_check( + bt_object_put_ref_no_null_check( g_queue_pop_tail(iterator->auto_seek.msgs)); } @@ -1803,7 +1943,7 @@ bt_self_component_port_input_message_iterator_seek_ns_from_origin( case BT_FUNC_STATUS_AGAIN: goto end; default: - abort(); + bt_common_abort(); } }