Adjust bt_component_borrow_class to match declaration
[deliverable/babeltrace.git] / lib / graph / component.c
index 13c2aa0d95fb9b5ef065560292759a80705025fe..6321762f032a8bc6804da82be455903b4daaee97 100644 (file)
@@ -204,6 +204,10 @@ struct bt_port *add_port(
        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: "
+               "%![comp-]+c, %![graph-]+g", component, graph);
 
        // TODO: Validate that the name is not already used.
 
@@ -267,7 +271,6 @@ int bt_component_create(struct bt_component_class *component_class,
        BT_ASSERT(user_component);
        BT_ASSERT(component_class);
        BT_ASSERT(name);
-
        type = bt_component_class_get_type(component_class);
        BT_LIB_LOGD("Creating empty component from component class: %![cc-]+C, "
                "comp-name=\"%s\"", component_class, name);
@@ -278,8 +281,7 @@ int bt_component_create(struct bt_component_class *component_class,
                goto end;
        }
 
-       bt_object_init_shared_with_parent(&component->base,
-               destroy_component);
+       bt_object_init_shared_with_parent(&component->base, destroy_component);
        component->class = component_class;
        bt_object_get_no_null_check(component->class);
        component->destroy = component_destroy_funcs[type];
@@ -329,7 +331,7 @@ const char *bt_component_get_name(const struct bt_component *component)
        return component->name->str;
 }
 
-struct bt_component_class *bt_component_borrow_class(
+const struct bt_component_class *bt_component_borrow_class_const(
                const struct bt_component *component)
 {
        BT_ASSERT_PRE_NON_NULL(component, "Component");
@@ -455,111 +457,6 @@ struct bt_port_output *bt_component_add_output_port(
                        BT_PORT_TYPE_OUTPUT, name, user_data);
 }
 
-static
-void remove_port_by_index(struct bt_component *component,
-               GPtrArray *ports, uint64_t index)
-{
-       struct bt_port *port;
-       struct bt_graph *graph;
-
-       BT_ASSERT(ports);
-       BT_ASSERT(index < ports->len);
-       port = g_ptr_array_index(ports, index);
-       BT_LIB_LOGD("Removing port from component: %![comp-]+c, %![port-]+p",
-               component, port);
-
-       /* Disconnect both ports of this port's connection, if any */
-       if (port->connection) {
-               bt_connection_end(port->connection, true);
-       }
-
-       /*
-        * The port's current reference count can be 0 at this point,
-        * which means its parent (component) keeps it alive. We are
-        * about to remove the port from its parent's container (with
-        * the g_ptr_array_remove_index() call below), which in this
-        * case would destroy it. This is not good because we still
-        * need the port for the bt_graph_notify_port_removed() call
-        * below (in which its component is `NULL` as expected because
-        * of the bt_object_set_parent() call below).
-        *
-        * To avoid a destroyed port during the message callback,
-        * get a reference now, and put it (destroying the port if its
-        * reference count is 0 at this point) after notifying the
-        * graph's user.
-        */
-       bt_object_get_no_null_check(&port->base);
-
-       /*
-        * Remove from parent's array of ports (weak refs). This never
-        * destroys the port object because its reference count is at
-        * least 1 thanks to the bt_object_get_no_null_check() call
-        * above.
-        */
-       g_ptr_array_remove_index(ports, index);
-
-       /* Detach port from its component parent */
-       bt_object_set_parent(&port->base, NULL);
-
-       /*
-        * Notify the graph's creator that a port is removed.
-        */
-       graph = bt_component_borrow_graph(component);
-       if (graph) {
-               bt_graph_notify_port_removed(graph, component, port);
-       }
-
-       BT_LIB_LOGD("Removed port from component: %![comp-]+c, %![port-]+p",
-               component, port);
-
-       /*
-        * Put the local reference. If this port's reference count was 0
-        * when entering this function, it is 1 now, so it is destroyed
-        * immediately.
-        */
-       bt_object_put_no_null_check(&port->base);
-}
-
-BT_HIDDEN
-void bt_component_remove_port(struct bt_component *component,
-               struct bt_port *port)
-{
-       uint64_t i;
-       GPtrArray *ports = NULL;
-
-       BT_ASSERT(component);
-       BT_ASSERT(port);
-
-       switch (port->type) {
-       case BT_PORT_TYPE_INPUT:
-               ports = component->input_ports;
-               break;
-       case BT_PORT_TYPE_OUTPUT:
-               ports = component->output_ports;
-               break;
-       default:
-               abort();
-       }
-
-       BT_ASSERT(ports);
-
-       for (i = 0; i < ports->len; i++) {
-               struct bt_port *cur_port = g_ptr_array_index(ports, i);
-
-               if (cur_port == port) {
-                       remove_port_by_index(component,
-                               ports, i);
-                       goto end;
-               }
-       }
-
-       BT_LIB_LOGW("Port to remove from component was not found: "
-               "%![comp-]+c, %![port-]+p", component, port);
-
-end:
-       return;
-}
-
 BT_HIDDEN
 enum bt_self_component_status bt_component_accept_port_connection(
                struct bt_component *comp, struct bt_port *self_port,
@@ -709,79 +606,16 @@ enum bt_self_component_status bt_component_port_connected(
                status = method(comp, self_port, (void *) other_port);
                BT_LOGD("User method returned: status=%s",
                        bt_self_component_status_string(status));
+               BT_ASSERT_PRE(status == BT_SELF_COMPONENT_STATUS_OK ||
+                       status == BT_SELF_COMPONENT_STATUS_ERROR ||
+                       status == BT_SELF_COMPONENT_STATUS_NOMEM,
+                       "Unexpected returned component status: status=%s",
+                       bt_self_component_status_string(status));
        }
 
        return status;
 }
 
-BT_HIDDEN
-void bt_component_port_disconnected(struct bt_component *comp,
-               struct bt_port *port)
-{
-       typedef void (*method_t)(void *, void *);
-
-       method_t method = NULL;
-
-       BT_ASSERT(comp);
-       BT_ASSERT(port);
-
-       switch (comp->class->type) {
-       case BT_COMPONENT_CLASS_TYPE_SOURCE:
-       {
-               struct bt_component_class_source *src_cc = (void *) comp->class;
-
-               switch (port->type) {
-               case BT_PORT_TYPE_OUTPUT:
-                       method = (method_t) src_cc->methods.output_port_disconnected;
-                       break;
-               default:
-                       abort();
-               }
-
-               break;
-       }
-       case BT_COMPONENT_CLASS_TYPE_FILTER:
-       {
-               struct bt_component_class_filter *flt_cc = (void *) comp->class;
-
-               switch (port->type) {
-               case BT_PORT_TYPE_INPUT:
-                       method = (method_t) flt_cc->methods.input_port_disconnected;
-                       break;
-               case BT_PORT_TYPE_OUTPUT:
-                       method = (method_t) flt_cc->methods.output_port_disconnected;
-                       break;
-               default:
-                       abort();
-               }
-
-               break;
-       }
-       case BT_COMPONENT_CLASS_TYPE_SINK:
-       {
-               struct bt_component_class_sink *sink_cc = (void *) comp->class;
-
-               switch (port->type) {
-               case BT_PORT_TYPE_INPUT:
-                       method = (method_t) sink_cc->methods.input_port_disconnected;
-                       break;
-               default:
-                       abort();
-               }
-
-               break;
-       }
-       default:
-               abort();
-       }
-
-       if (method) {
-               BT_LIB_LOGD("Calling user's \"port disconnected\" method: "
-                       "%![comp-]+c, %![port-]+p", comp, port);
-               method(comp, port);
-       }
-}
-
 BT_HIDDEN
 void bt_component_add_destroy_listener(struct bt_component *component,
                bt_component_destroy_listener_func func, void *data)
This page took 0.030633 seconds and 5 git commands to generate.