lib: make the "port connected" method return a status

[babeltrace.git] / include / babeltrace / graph / component-internal.h

diff --git a/include/babeltrace/graph/component-internal.h b/include/babeltrace/graph/component-internal.h
index f6ed6ac77f00d2d00434aa49026429ed4ca673d8..13e632ed3cf8c5edd66e237e1e6bed9c4bb80afa 100644 (file)
--- a/include/babeltrace/graph/component-internal.h
+++ b/include/babeltrace/graph/component-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_COMPONENT_INTERNAL_H
-#define BABELTRACE_COMPONENT_COMPONENT_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_COMPONENT_INTERNAL_H
+#define BABELTRACE_GRAPH_COMPONENT_INTERNAL_H
 
 /*
  * BabelTrace - Component internal
@@ -32,12 +32,11 @@
 #include <babeltrace/graph/component-class-internal.h>
 #include <babeltrace/graph/port-internal.h>
 #include <babeltrace/object-internal.h>
+#include <babeltrace/types.h>
+#include <babeltrace/assert-internal.h>
 #include <glib.h>
 #include <stdio.h>
 
-#define DEFAULT_INPUT_PORT_NAME                "default"
-#define DEFAULT_OUTPUT_PORT_NAME       "default"
-
 typedef void (*bt_component_destroy_listener_func)(
                struct bt_component *class, void *data);
 
@@ -60,26 +59,15 @@ struct bt_component {
        /* User-defined data */
        void *user_data;
 
-       /*
-        * Used to protect operations which may only be used during
-        * a component's initialization.
-        */
-       bool initializing;
-
        /* Input and output ports (weak references) */
        GPtrArray *input_ports;
        GPtrArray *output_ports;
 
        /* Array of struct bt_component_destroy_listener */
        GArray *destroy_listeners;
-};
 
-static inline
-struct bt_component *bt_component_from_private(
-               struct bt_private_component *private_component)
-{
-       return (void *) private_component;
-}
+       bool initialized;
+};
 
 static inline
 struct bt_private_component *bt_private_component_from_component(
@@ -88,13 +76,19 @@ struct bt_private_component *bt_private_component_from_component(
        return (void *) component;
 }
 
+BT_HIDDEN
+enum bt_component_status bt_component_create(
+               struct bt_component_class *component_class,
+               const char *name, struct bt_component **component);
+
 BT_HIDDEN
 enum bt_component_status bt_component_accept_port_connection(
                struct bt_component *component, struct bt_port *self_port,
                struct bt_port *other_port);
 
 BT_HIDDEN
-void bt_component_port_connected(struct bt_component *comp,
+enum bt_component_status bt_component_port_connected(
+               struct bt_component *comp,
                struct bt_port *self_port, struct bt_port *other_port);
 
 BT_HIDDEN
@@ -129,11 +123,13 @@ struct bt_port *bt_component_get_output_port_by_name(struct bt_component *comp,
 
 BT_HIDDEN
 struct bt_port *bt_component_add_input_port(
-               struct bt_component *component, const char *name);
+               struct bt_component *component, const char *name,
+               void *user_data);
 
 BT_HIDDEN
 struct bt_port *bt_component_add_output_port(
-               struct bt_component *component, const char *name);
+               struct bt_component *component, const char *name,
+               void *user_data);
 
 BT_HIDDEN
 enum bt_component_status bt_component_remove_port(
@@ -147,4 +143,33 @@ BT_HIDDEN
 void bt_component_remove_destroy_listener(struct bt_component *component,
                bt_component_destroy_listener_func func, void *data);
 
-#endif /* BABELTRACE_COMPONENT_COMPONENT_INTERNAL_H */
+static inline
+const char *bt_component_status_string(enum bt_component_status status)
+{
+       switch (status) {
+       case BT_COMPONENT_STATUS_OK:
+               return "BT_COMPONENT_STATUS_OK";
+       case BT_COMPONENT_STATUS_END:
+               return "BT_COMPONENT_STATUS_END";
+       case BT_COMPONENT_STATUS_AGAIN:
+               return "BT_COMPONENT_STATUS_AGAIN";
+       case BT_COMPONENT_STATUS_REFUSE_PORT_CONNECTION:
+               return "BT_COMPONENT_STATUS_REFUSE_PORT_CONNECTION";
+       case BT_COMPONENT_STATUS_ERROR:
+               return "BT_COMPONENT_STATUS_ERROR";
+       case BT_COMPONENT_STATUS_UNSUPPORTED:
+               return "BT_COMPONENT_STATUS_UNSUPPORTED";
+       case BT_COMPONENT_STATUS_INVALID:
+               return "BT_COMPONENT_STATUS_INVALID";
+       case BT_COMPONENT_STATUS_NOMEM:
+               return "BT_COMPONENT_STATUS_NOMEM";
+       case BT_COMPONENT_STATUS_NOT_FOUND:
+               return "BT_COMPONENT_STATUS_NOT_FOUND";
+       case BT_COMPONENT_STATUS_GRAPH_IS_CANCELED:
+               return "BT_COMPONENT_STATUS_GRAPH_IS_CANCELED";
+       default:
+               return "(unknown)";
+       }
+}
+
+#endif /* BABELTRACE_GRAPH_COMPONENT_INTERNAL_H */