Fix: lib: assert if an error occurs in `bt_message_iterator_class_finalize_method`
[babeltrace.git] / src / lib / graph / iterator.c
index fad7967a68d092d89bd2cf0f8b8bf3b2f4982db0..796ade072d59c0c13b45758980a7e29b5af1fc47 100644 (file)
@@ -30,8 +30,7 @@
 #include <babeltrace2/graph/message-iterator.h>
 #include <babeltrace2/types.h>
 #include "common/assert.h"
-#include "lib/assert-pre.h"
-#include "lib/assert-post.h"
+#include "lib/assert-cond.h"
 #include <stdint.h>
 #include <inttypes.h>
 #include <stdbool.h>
 #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))
 
 static inline
 void set_msg_iterator_state(struct bt_message_iterator *iterator,
@@ -201,6 +201,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);
@@ -274,7 +275,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 =
@@ -289,19 +291,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 ==
@@ -405,7 +411,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: "
@@ -456,9 +464,9 @@ 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_message_iterator_create_from_sink_component_status
@@ -468,9 +476,9 @@ 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__);
 }
 
 void *bt_self_message_iterator_get_data(
@@ -479,7 +487,7 @@ void *bt_self_message_iterator_get_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);
        return iterator->user_data;
 }
 
@@ -489,7 +497,7 @@ void bt_self_message_iterator_set_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);
@@ -499,8 +507,10 @@ 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;
 }
@@ -510,7 +520,7 @@ void bt_self_message_iterator_configuration_set_can_seek_forward(
  * time.
  */
 
-BT_ASSERT_POST_DEV_FUNC
+BT_ASSERT_COND_DEV_FUNC
 static
 bool clock_snapshots_are_monotonic_one(
                struct bt_message_iterator *iterator,
@@ -592,7 +602,7 @@ end:
        return result;
 }
 
-BT_ASSERT_POST_DEV_FUNC
+BT_ASSERT_COND_DEV_FUNC
 static
 bool clock_snapshots_are_monotonic(
                struct bt_message_iterator *iterator,
@@ -619,7 +629,7 @@ end:
  * stream is compatible with what we've seen before.
  */
 
-BT_ASSERT_POST_DEV_FUNC
+BT_ASSERT_COND_DEV_FUNC
 static
 bool clock_classes_are_compatible_one(struct bt_message_iterator *iterator,
                const struct bt_message *msg)
@@ -659,7 +669,7 @@ bool clock_classes_are_compatible_one(struct bt_message_iterator *iterator,
 
                case CLOCK_EXPECTATION_NONE:
                        if (clock_class) {
-                               BT_ASSERT_POST_DEV_MSG(
+                               BT_ASSERT_COND_DEV_MSG(
                                        "Expecting no clock class, got one: %![cc-]+K",
                                        clock_class);
                                result = false;
@@ -670,14 +680,14 @@ bool clock_classes_are_compatible_one(struct bt_message_iterator *iterator,
 
                case CLOCK_EXPECTATION_ORIGIN_UNIX:
                        if (!clock_class) {
-                               BT_ASSERT_POST_DEV_MSG(
+                               BT_ASSERT_COND_DEV_MSG(
                                        "Expecting a clock class, got none.");
                                result = false;
                                goto end;
                        }
 
                        if (!bt_clock_class_origin_is_unix_epoch(clock_class)) {
-                               BT_ASSERT_POST_DEV_MSG(
+                               BT_ASSERT_COND_DEV_MSG(
                                        "Expecting a clock class with Unix epoch origin: %![cc-]+K",
                                        clock_class);
                                result = false;
@@ -687,14 +697,14 @@ bool clock_classes_are_compatible_one(struct bt_message_iterator *iterator,
 
                case CLOCK_EXPECTATION_ORIGIN_OTHER_UUID:
                        if (!clock_class) {
-                               BT_ASSERT_POST_DEV_MSG(
+                               BT_ASSERT_COND_DEV_MSG(
                                        "Expecting a clock class, got none.");
                                result = false;
                                goto end;
                        }
 
                        if (bt_clock_class_origin_is_unix_epoch(clock_class)) {
-                               BT_ASSERT_POST_DEV_MSG(
+                               BT_ASSERT_COND_DEV_MSG(
                                        "Expecting a clock class without Unix epoch origin: %![cc-]+K",
                                        clock_class);
                                result = false;
@@ -702,7 +712,7 @@ bool clock_classes_are_compatible_one(struct bt_message_iterator *iterator,
                        }
 
                        if (!clock_class_uuid) {
-                               BT_ASSERT_POST_DEV_MSG(
+                               BT_ASSERT_COND_DEV_MSG(
                                        "Expecting a clock class with UUID: %![cc-]+K",
                                        clock_class);
                                result = false;
@@ -710,7 +720,7 @@ bool clock_classes_are_compatible_one(struct bt_message_iterator *iterator,
                        }
 
                        if (bt_uuid_compare(iterator->clock_expectation.uuid, clock_class_uuid)) {
-                               BT_ASSERT_POST_DEV_MSG(
+                               BT_ASSERT_COND_DEV_MSG(
                                        "Expecting a clock class with UUID, got one "
                                        "with a different UUID: %![cc-]+K, expected-uuid=%!u",
                                        clock_class, iterator->clock_expectation.uuid);
@@ -721,14 +731,14 @@ bool clock_classes_are_compatible_one(struct bt_message_iterator *iterator,
 
                case CLOCK_EXPECTATION_ORIGIN_OTHER_NO_UUID:
                        if (!clock_class) {
-                               BT_ASSERT_POST_DEV_MSG(
+                               BT_ASSERT_COND_DEV_MSG(
                                        "Expecting a clock class, got none.");
                                result = false;
                                goto end;
                        }
 
                        if (bt_clock_class_origin_is_unix_epoch(clock_class)) {
-                               BT_ASSERT_POST_DEV_MSG(
+                               BT_ASSERT_COND_DEV_MSG(
                                        "Expecting a clock class without Unix epoch origin: %![cc-]+K",
                                        clock_class);
                                result = false;
@@ -736,7 +746,7 @@ bool clock_classes_are_compatible_one(struct bt_message_iterator *iterator,
                        }
 
                        if (clock_class_uuid) {
-                               BT_ASSERT_POST_DEV_MSG(
+                               BT_ASSERT_COND_DEV_MSG(
                                        "Expecting a clock class without UUID: %![cc-]+K",
                                        clock_class);
                                result = false;
@@ -752,7 +762,7 @@ end:
        return result;
 }
 
-BT_ASSERT_POST_DEV_FUNC
+BT_ASSERT_COND_DEV_FUNC
 static
 bool clock_classes_are_compatible(
                struct bt_message_iterator *iterator,
@@ -779,6 +789,8 @@ end:
  * messages.
  */
 
+#define NEXT_METHOD_NAME       "bt_message_iterator_class_next_method"
+
 static
 enum bt_message_iterator_class_next_method_status
 call_iterator_next_method(
@@ -794,13 +806,20 @@ 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);
+       BT_ASSERT_POST_DEV_NO_ERROR_IF_NO_ERROR_STATUS(NEXT_METHOD_NAME,
+               status);
 
        return status;
 }
@@ -813,16 +832,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",
@@ -863,7 +884,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);
@@ -888,7 +910,7 @@ 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;
 }
 
@@ -898,7 +920,7 @@ struct bt_self_component *bt_self_message_iterator_borrow_component(
        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;
 }
 
@@ -908,10 +930,13 @@ struct bt_self_component_port_output *bt_self_message_iterator_borrow_port(
        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"
+
 enum bt_message_iterator_can_seek_ns_from_origin_status
 bt_message_iterator_can_seek_ns_from_origin(
                struct bt_message_iterator *iterator,
@@ -920,10 +945,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",
@@ -942,7 +967,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(
@@ -952,7 +978,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);
 
@@ -983,6 +1011,9 @@ end:
        return status;
 }
 
+#define CAN_SEEK_BEGINNING_METHOD_NAME                                 \
+       "bt_message_iterator_class_can_seek_beginning"
+
 enum bt_message_iterator_can_seek_beginning_status
 bt_message_iterator_can_seek_beginning(
                struct bt_message_iterator *iterator,
@@ -991,10 +1022,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",
@@ -1009,13 +1040,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;
@@ -1077,21 +1110,24 @@ bool message_iterator_can_seek_beginning(
        return can_seek;
 }
 
+#define SEEK_BEGINNING_METHOD_NAME                                     \
+       "bt_message_iterator_class_seek_beginning_method"
+
 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);
 
        /*
@@ -1106,13 +1142,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: "
@@ -1128,7 +1166,7 @@ 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;
 }
@@ -1226,7 +1264,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;
@@ -1247,7 +1287,9 @@ int auto_seek_handle_message(
                        (const void *) 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;
@@ -1258,8 +1300,10 @@ 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,
+               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(
@@ -1526,7 +1570,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);
@@ -1639,6 +1685,10 @@ 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"
+
+
 enum bt_message_iterator_seek_ns_from_origin_status
 bt_message_iterator_seek_ns_from_origin(
                struct bt_message_iterator *iterator,
@@ -1649,15 +1699,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);
@@ -1695,13 +1745,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: "
@@ -1727,7 +1779,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,
@@ -1918,7 +1971,7 @@ bt_bool bt_self_message_iterator_is_interrupted(
        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);
 }
 
This page took 0.03188 seconds and 4 git commands to generate.