lib: add bt_{graph,query_executor}_add_interrupter()

[babeltrace.git] / src / lib / graph / component.c

diff --git a/src/lib/graph/component.c b/src/lib/graph/component.c
index 90129b073d46429f8f3a2f6d337f10b61a686fe5..11144fb42c400eb531b8fa8340f43ef3d0a1eaec 100644 (file)
--- a/src/lib/graph/component.c
+++ b/src/lib/graph/component.c
@@ -33,6 +33,7 @@
 #include <babeltrace2/graph/component-source-const.h>
 #include <babeltrace2/graph/component-filter-const.h>
 #include <babeltrace2/graph/component-sink-const.h>
+#include <babeltrace2/graph/graph-const.h>
 #include "common/macros.h"
 #include "compat/compiler.h"
 #include <babeltrace2/types.h>
@@ -50,6 +51,7 @@
 #include "graph.h"
 #include "message/iterator.h"
 #include "port.h"
+#include "lib/func-status.h"
 
 static
 struct bt_component * (* const component_create_funcs[])(
@@ -188,27 +190,24 @@ void destroy_component(struct bt_object *obj)
 enum bt_component_class_type bt_component_get_class_type(
                const struct bt_component *component)
 {
-       BT_ASSERT_PRE_NON_NULL(component, "Component");
+       BT_ASSERT_PRE_DEV_NON_NULL(component, "Component");
        return component->class->type;
 }
 
 static
-enum bt_self_component_status add_port(
+enum bt_self_component_add_port_status add_port(
                struct bt_component *component, GPtrArray *ports,
                enum bt_port_type port_type, const char *name, void *user_data,
                struct bt_port **port)
 {
        struct bt_port *new_port = NULL;
        struct bt_graph *graph = NULL;
-       enum bt_self_component_status status;
+       enum bt_self_component_add_port_status status;
 
        BT_ASSERT_PRE_NON_NULL(component, "Component");
        BT_ASSERT_PRE_NON_NULL(name, "Name");
        BT_ASSERT_PRE(strlen(name) > 0, "Name is empty");
        graph = bt_component_borrow_graph(component);
-       BT_ASSERT_PRE(graph && !bt_graph_is_canceled(graph),
-               "Component's graph is canceled: %![comp-]+c, %![graph-]+g",
-               component, graph);
        BT_ASSERT_PRE(
                graph->config_state == BT_GRAPH_CONFIGURATION_STATE_CONFIGURING,
                "Component's graph is already configured: "
@@ -222,8 +221,8 @@ enum bt_self_component_status add_port(
 
        new_port = bt_port_create(component, port_type, name, user_data);
        if (!new_port) {
-               BT_LOGE_STR("Cannot create port object.");
-               status = BT_SELF_COMPONENT_STATUS_NOMEM;
+               BT_LIB_LOGE_APPEND_CAUSE("Cannot create port object.");
+               status = BT_FUNC_STATUS_MEMORY_ERROR;
                goto error;
        }
 
@@ -240,12 +239,12 @@ enum bt_self_component_status add_port(
         */
        graph = bt_component_borrow_graph(component);
        if (graph) {
-               enum bt_graph_listener_status listener_status;
+               enum bt_graph_listener_func_status listener_status;
 
                listener_status = bt_graph_notify_port_added(graph, new_port);
-               if (listener_status != BT_GRAPH_LISTENER_STATUS_OK) {
+               if (listener_status != BT_FUNC_STATUS_OK) {
                        bt_graph_make_faulty(graph);
-                       status = listener_status;
+                       status = (int) listener_status;
                        goto error;
                }
        }
@@ -254,7 +253,7 @@ enum bt_self_component_status add_port(
                "%![comp-]+c, %![port-]+p", component, new_port);
 
        *port = new_port;
-       status = BT_SELF_COMPONENT_STATUS_OK;
+       status = BT_FUNC_STATUS_OK;
 
        goto end;
 error:
@@ -271,14 +270,14 @@ end:
 BT_HIDDEN
 uint64_t bt_component_get_input_port_count(const struct bt_component *comp)
 {
-       BT_ASSERT_PRE_NON_NULL(comp, "Component");
+       BT_ASSERT_PRE_DEV_NON_NULL(comp, "Component");
        return (uint64_t) comp->input_ports->len;
 }
 
 BT_HIDDEN
 uint64_t bt_component_get_output_port_count(const struct bt_component *comp)
 {
-       BT_ASSERT_PRE_NON_NULL(comp, "Component");
+       BT_ASSERT_PRE_DEV_NON_NULL(comp, "Component");
        return (uint64_t) comp->output_ports->len;
 }
 
@@ -300,7 +299,8 @@ int bt_component_create(struct bt_component_class *component_class,
                bt_common_logging_level_string(log_level));
        component = component_create_funcs[type](component_class);
        if (!component) {
-               BT_LOGE_STR("Cannot create specific component object.");
+               BT_LIB_LOGE_APPEND_CAUSE(
+                       "Cannot create specific component object.");
                ret = -1;
                goto end;
        }
@@ -311,7 +311,7 @@ int bt_component_create(struct bt_component_class *component_class,
        component->destroy = component_destroy_funcs[type];
        component->name = g_string_new(name);
        if (!component->name) {
-               BT_LOGE_STR("Failed to allocate one GString.");
+               BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GString.");
                ret = -1;
                goto end;
        }
@@ -320,7 +320,7 @@ int bt_component_create(struct bt_component_class *component_class,
        component->input_ports = g_ptr_array_new_with_free_func(
                (GDestroyNotify) bt_object_try_spec_release);
        if (!component->input_ports) {
-               BT_LOGE_STR("Failed to allocate one GPtrArray.");
+               BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GPtrArray.");
                ret = -1;
                goto end;
        }
@@ -328,7 +328,7 @@ int bt_component_create(struct bt_component_class *component_class,
        component->output_ports = g_ptr_array_new_with_free_func(
                (GDestroyNotify) bt_object_try_spec_release);
        if (!component->output_ports) {
-               BT_LOGE_STR("Failed to allocate one GPtrArray.");
+               BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GPtrArray.");
                ret = -1;
                goto end;
        }
@@ -336,7 +336,7 @@ int bt_component_create(struct bt_component_class *component_class,
        component->destroy_listeners = g_array_new(FALSE, TRUE,
                sizeof(struct bt_component_destroy_listener));
        if (!component->destroy_listeners) {
-               BT_LOGE_STR("Failed to allocate one GArray.");
+               BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GArray.");
                ret = -1;
                goto end;
        }
@@ -352,14 +352,14 @@ end:
 
 const char *bt_component_get_name(const struct bt_component *component)
 {
-       BT_ASSERT_PRE_NON_NULL(component, "Component");
+       BT_ASSERT_PRE_DEV_NON_NULL(component, "Component");
        return component->name->str;
 }
 
 const struct bt_component_class *bt_component_borrow_class_const(
                const struct bt_component *component)
 {
-       BT_ASSERT_PRE_NON_NULL(component, "Component");
+       BT_ASSERT_PRE_DEV_NON_NULL(component, "Component");
        return component->class;
 }
 
@@ -367,7 +367,7 @@ void *bt_self_component_get_data(const struct bt_self_component *self_comp)
 {
        struct bt_component *component = (void *) self_comp;
 
-       BT_ASSERT_PRE_NON_NULL(component, "Component");
+       BT_ASSERT_PRE_DEV_NON_NULL(component, "Component");
        return component->user_data;
 }
 
@@ -376,7 +376,7 @@ void bt_self_component_set_data(struct bt_self_component *self_comp,
 {
        struct bt_component *component = (void *) self_comp;
 
-       BT_ASSERT_PRE_NON_NULL(component, "Component");
+       BT_ASSERT_PRE_DEV_NON_NULL(component, "Component");
        component->user_data = data;
        BT_LIB_LOGD("Set component's user data: %!+c", component);
 }
@@ -389,12 +389,6 @@ void bt_component_set_graph(struct bt_component *component,
                graph ? &graph->base : NULL);
 }
 
-bt_bool bt_component_graph_is_canceled(const struct bt_component *component)
-{
-       return bt_graph_is_canceled(
-               (void *) bt_object_borrow_parent(&component->base));
-}
-
 static
 struct bt_port *borrow_port_by_name(GPtrArray *ports,
                const char *name)
@@ -407,7 +401,7 @@ struct bt_port *borrow_port_by_name(GPtrArray *ports,
        for (i = 0; i < ports->len; i++) {
                struct bt_port *port = g_ptr_array_index(ports, i);
 
-               if (!strcmp(name, port->name->str)) {
+               if (strcmp(name, port->name->str) == 0) {
                        ret_port = port;
                        break;
                }
@@ -428,7 +422,7 @@ BT_HIDDEN
 struct bt_port_output *bt_component_borrow_output_port_by_name(
                struct bt_component *comp, const char *name)
 {
-       BT_ASSERT_PRE_NON_NULL(comp, "Component");
+       BT_ASSERT_PRE_DEV_NON_NULL(comp, "Component");
        return (void *)
                borrow_port_by_name(comp->output_ports, name);
 }
@@ -444,8 +438,8 @@ BT_HIDDEN
 struct bt_port_input *bt_component_borrow_input_port_by_index(
                struct bt_component *comp, uint64_t index)
 {
-       BT_ASSERT_PRE_NON_NULL(comp, "Component");
-       BT_ASSERT_PRE_VALID_INDEX(index, comp->input_ports->len);
+       BT_ASSERT_PRE_DEV_NON_NULL(comp, "Component");
+       BT_ASSERT_PRE_DEV_VALID_INDEX(index, comp->input_ports->len);
        return (void *)
                borrow_port_by_index(comp->input_ports, index);
 }
@@ -454,14 +448,14 @@ BT_HIDDEN
 struct bt_port_output *bt_component_borrow_output_port_by_index(
                struct bt_component *comp, uint64_t index)
 {
-       BT_ASSERT_PRE_NON_NULL(comp, "Component");
-       BT_ASSERT_PRE_VALID_INDEX(index, comp->output_ports->len);
+       BT_ASSERT_PRE_DEV_NON_NULL(comp, "Component");
+       BT_ASSERT_PRE_DEV_VALID_INDEX(index, comp->output_ports->len);
        return (void *)
                borrow_port_by_index(comp->output_ports, index);
 }
 
 BT_HIDDEN
-enum bt_self_component_status bt_component_add_input_port(
+enum bt_self_component_add_port_status bt_component_add_input_port(
                struct bt_component *component, const char *name,
                void *user_data, struct bt_port **port)
 {
@@ -471,7 +465,7 @@ enum bt_self_component_status bt_component_add_input_port(
 }
 
 BT_HIDDEN
-enum bt_self_component_status bt_component_add_output_port(
+enum bt_self_component_add_port_status bt_component_add_output_port(
                struct bt_component *component, const char *name,
                void *user_data, struct bt_port **port)
 {
@@ -481,14 +475,16 @@ enum bt_self_component_status bt_component_add_output_port(
 }
 
 BT_HIDDEN
-enum bt_self_component_status bt_component_port_connected(
+enum bt_component_class_port_connected_method_status
+bt_component_port_connected(
                struct bt_component *comp, struct bt_port *self_port,
                struct bt_port *other_port)
 {
-       typedef enum bt_self_component_status (*method_t)(
+       typedef enum bt_component_class_port_connected_method_status (*method_t)(
                void *, void *, const void *);
 
-       enum bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
+       enum bt_component_class_port_connected_method_status status =
+               BT_FUNC_STATUS_OK;
        method_t method = NULL;
 
        BT_ASSERT(comp);
@@ -549,14 +545,14 @@ enum bt_self_component_status bt_component_port_connected(
                BT_LIB_LOGD("Calling user's \"port connected\" method: "
                        "%![comp-]+c, %![self-port-]+p, %![other-port-]+p",
                        comp, self_port, other_port);
-               status = method(comp, self_port, (void *) other_port);
+               status = (int) method(comp, self_port, (void *) other_port);
                BT_LOGD("User method returned: status=%s",
-                       bt_self_component_status_string(status));
-               BT_ASSERT_POST(status == BT_SELF_COMPONENT_STATUS_OK ||
-                       status == BT_SELF_COMPONENT_STATUS_ERROR ||
-                       status == BT_SELF_COMPONENT_STATUS_NOMEM,
+                       bt_common_func_status_string(status));
+               BT_ASSERT_POST(status == BT_FUNC_STATUS_OK ||
+                       status == BT_FUNC_STATUS_ERROR ||
+                       status == BT_FUNC_STATUS_MEMORY_ERROR,
                        "Unexpected returned component status: status=%s",
-                       bt_self_component_status_string(status));
+                       bt_common_func_status_string(status));
        }
 
        return status;
@@ -605,7 +601,7 @@ void bt_component_remove_destroy_listener(struct bt_component *component,
 bt_logging_level bt_component_get_logging_level(
                const struct bt_component *component)
 {
-       BT_ASSERT_PRE_NON_NULL(component, "Component");
+       BT_ASSERT_PRE_DEV_NON_NULL(component, "Component");
        return component->log_level;
 }