X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fgraph%2Fcomponent-internal.h;h=f742c7b1717f692bf6dcaca032e0083a2acdfe09;hb=312c056ae3d374b253fa0cfe5ed576c0b0e5e569;hp=27b03b09595520b5e19598b0dffcec0473735b8c;hpb=3230ee6b4f3a704958b761daecae835c56938bc9;p=babeltrace.git

diff --git a/include/babeltrace/graph/component-internal.h b/include/babeltrace/graph/component-internal.h
index 27b03b09..f742c7b1 100644
--- 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,22 +59,18 @@ 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;
+
+	bool initialized;
 };
 
 static inline
-struct bt_component *bt_component_from_private(
+struct bt_component *bt_component_borrow_from_private(
 		struct bt_private_component *private_component)
 {
 	return (void *) private_component;
@@ -88,6 +83,18 @@ struct bt_private_component *bt_private_component_from_component(
 	return (void *) component;
 }
 
+static inline
+struct bt_graph *bt_component_borrow_graph(struct bt_component *comp)
+{
+	BT_ASSERT(comp);
+	return (void *) comp->base.parent;
+}
+
+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,
@@ -106,34 +113,36 @@ void bt_component_set_graph(struct bt_component *component,
 		struct bt_graph *graph);
 
 BT_HIDDEN
-uint64_t bt_component_get_input_port_count(struct bt_component *comp);
+int64_t bt_component_get_input_port_count(struct bt_component *comp);
 
 BT_HIDDEN
-uint64_t bt_component_get_output_port_count(struct bt_component *comp);
+int64_t bt_component_get_output_port_count(struct bt_component *comp);
 
 BT_HIDDEN
-struct bt_port *bt_component_get_input_port_at_index(struct bt_component *comp,
-		int index);
+struct bt_port *bt_component_get_input_port_by_index(struct bt_component *comp,
+		uint64_t index);
 
 BT_HIDDEN
-struct bt_port *bt_component_get_output_port_at_index(struct bt_component *comp,
-		int index);
+struct bt_port *bt_component_get_output_port_by_index(struct bt_component *comp,
+		uint64_t index);
 
 BT_HIDDEN
-struct bt_port *bt_component_get_input_port(struct bt_component *comp,
+struct bt_port *bt_component_get_input_port_by_name(struct bt_component *comp,
 		const char *name);
 
 BT_HIDDEN
-struct bt_port *bt_component_get_output_port(struct bt_component *comp,
+struct bt_port *bt_component_get_output_port_by_name(struct bt_component *comp,
 		const char *name);
 
 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 +156,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 */