Remove component's initialization state flag

[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..d9fae8f0bd4874614e8034903817a5485f5f7155 100644 (file)
--- a/include/babeltrace/graph/component-internal.h
+++ b/include/babeltrace/graph/component-internal.h
@@ -32,12 +32,10 @@
 #include <babeltrace/graph/component-class-internal.h>
 #include <babeltrace/graph/port-internal.h>
 #include <babeltrace/object-internal.h>
+#include <babeltrace/types.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,12 +58,6 @@ 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;
@@ -129,11 +121,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 +141,31 @@ BT_HIDDEN
 void bt_component_remove_destroy_listener(struct bt_component *component,
                bt_component_destroy_listener_func func, void *data);
 
+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";
+       default:
+               return "(unknown)";
+       }
+}
+
 #endif /* BABELTRACE_COMPONENT_COMPONENT_INTERNAL_H */