Always evaluate BT_ASSERT(); add BT_ASSERT_DBG() for debug mode only

[babeltrace.git] / src / lib / graph / component-class-sink-simple.c

diff --git a/src/lib/graph/component-class-sink-simple.c b/src/lib/graph/component-class-sink-simple.c
index 797ee50a61d1ffae98d49fa47dbe5549d2344ade..8a4aba536d9d97aa787cae2d5da6404244859548 100644 (file)
--- a/src/lib/graph/component-class-sink-simple.c
+++ b/src/lib/graph/component-class-sink-simple.c
@@ -51,8 +51,9 @@ struct simple_sink_data {
 };
 
 static
-enum bt_component_class_init_method_status simple_sink_init(
-               struct bt_self_component_sink *self_comp,
+enum bt_component_class_initialize_method_status simple_sink_init(
+               bt_self_component_sink *self_comp,
+               bt_self_component_sink_configuration *config,
                const struct bt_value *params, void *init_method_data)
 {
        int status = BT_FUNC_STATUS_OK;
@@ -109,7 +110,9 @@ enum bt_component_class_sink_graph_is_configured_method_status
 simple_sink_graph_is_configured(
        bt_self_component_sink *self_comp)
 {
-       int status = BT_FUNC_STATUS_OK;
+       bt_component_class_sink_graph_is_configured_method_status status;
+       bt_self_component_port_input_message_iterator_create_from_sink_component_status
+               msg_iter_status;
        struct simple_sink_data *data = bt_self_component_get_data(
                bt_self_component_sink_as_self_component(self_comp));
 
@@ -122,36 +125,40 @@ simple_sink_graph_is_configured(
                BT_LIB_LOGE_APPEND_CAUSE(
                        "Simple sink component's input port is not connected: "
                        "%![comp-]+c, %![port-]+p", self_comp, self_port);
-               status = BT_FUNC_STATUS_ERROR;
+               status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_ERROR;
                goto end;
        }
 
        BT_ASSERT(data);
-       data->msg_iter =
-               bt_self_component_port_input_message_iterator_create_from_sink_component(
-                       self_comp, self_port);
-       if (!data->msg_iter) {
+       msg_iter_status = bt_self_component_port_input_message_iterator_create_from_sink_component(
+               self_comp, self_port, &data->msg_iter);
+       if (msg_iter_status != BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_CREATE_FROM_SINK_COMPONENT_STATUS_OK) {
                BT_LIB_LOGE_APPEND_CAUSE(
                        "Cannot create input port message iterator: "
                        "%![comp-]+c, %![port-]+p", self_comp, self_port);
-               status = BT_FUNC_STATUS_MEMORY_ERROR;
+               status = (int) msg_iter_status;
                goto end;
        }
 
        if (data->init_method_data.init_func) {
+               bt_graph_simple_sink_component_initialize_func_status init_status;
+
                /* Call user's initialization function */
-               status = data->init_method_data.init_func(data->msg_iter,
+               init_status = data->init_method_data.init_func(data->msg_iter,
                        data->init_method_data.user_data);
-               if (status != BT_FUNC_STATUS_OK) {
+               if (init_status != BT_GRAPH_SIMPLE_SINK_COMPONENT_INITIALIZE_FUNC_STATUS_OK) {
                        BT_LIB_LOGW_APPEND_CAUSE(
                                "Simple sink component's user's initialization function failed: "
                                "status=%s, %![comp-]+c, %![port-]+p",
-                               bt_common_func_status_string(status),
+                               bt_common_func_status_string(init_status),
                                self_comp, self_port);
+                       status = (int) init_status;
                        goto end;
                }
        }
 
+       status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_OK;
+
 end:
        return status;
 }
@@ -164,9 +171,9 @@ enum bt_component_class_sink_consume_method_status simple_sink_consume(
        struct simple_sink_data *data = bt_self_component_get_data(
                bt_self_component_sink_as_self_component(self_comp));
 
-       BT_ASSERT(data);
-       BT_ASSERT(data->init_method_data.consume_func);
-       BT_ASSERT(data->msg_iter);
+       BT_ASSERT_DBG(data);
+       BT_ASSERT_DBG(data->init_method_data.consume_func);
+       BT_ASSERT_DBG(data->msg_iter);
 
        /* Call user's "consume" function */
        status = data->init_method_data.consume_func(data->msg_iter,
@@ -197,7 +204,7 @@ struct bt_component_class_sink *bt_component_class_sink_simple_borrow(void)
                goto end;
        }
 
-       set_method_status = bt_component_class_sink_set_init_method(
+       set_method_status = bt_component_class_sink_set_initialize_method(
                simple_comp_cls, simple_sink_init);
        BT_ASSERT(set_method_status == BT_FUNC_STATUS_OK);
        set_method_status = bt_component_class_sink_set_finalize_method(