X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fgraph%2Fgraph.h;h=acff83931a8b1a069f1b2e110bc58715ea9cf14e;hb=5c5632787fc9cafa602c89a28966bcfd01ec0204;hp=06f2af1b122407a46b07e29465a1fec1969f0d15;hpb=0d107cdd376ff07c7bc6da9dfd46d57463442df1;p=babeltrace.git

diff --git a/include/babeltrace/graph/graph.h b/include/babeltrace/graph/graph.h
index 06f2af1b..acff8393 100644
--- a/include/babeltrace/graph/graph.h
+++ b/include/babeltrace/graph/graph.h
@@ -27,7 +27,7 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/graph/component.h>
+/* For bt_bool */
 #include <babeltrace/types.h>
 
 #ifdef __cplusplus
@@ -36,8 +36,12 @@ extern "C" {
 
 struct bt_port;
 struct bt_connection;
+struct bt_component;
+struct bt_component_class;
+struct bt_value;
 
 enum bt_graph_status {
+	BT_GRAPH_STATUS_COMPONENT_REFUSES_PORT_CONNECTION = 111,
 	/** Canceled. */
 	BT_GRAPH_STATUS_CANCELED = 125,
 	/** No sink can consume at the moment. */
@@ -45,14 +49,14 @@ enum bt_graph_status {
 	/** Downstream component does not support multiple inputs. */
 	BT_GRAPH_STATUS_END = 1,
 	BT_GRAPH_STATUS_OK = 0,
-	/** Component is already part of another graph. */
-	BT_GRAPH_STATUS_ALREADY_IN_A_GRAPH = -2,
 	/** Invalid arguments. */
 	BT_GRAPH_STATUS_INVALID = -22,
 	/** No sink in graph. */
 	BT_GRAPH_STATUS_NO_SINK = -6,
 	/** General error. */
 	BT_GRAPH_STATUS_ERROR = -1,
+	BT_GRAPH_STATUS_CANNOT_CONSUME = -2,
+	BT_GRAPH_STATUS_NOMEM = -12,
 };
 
 typedef void (*bt_graph_port_added_listener)(struct bt_port *port,
@@ -66,16 +70,30 @@ typedef void (*bt_graph_ports_disconnected_listener)(
 		struct bt_component *downstream_component,
 		struct bt_port *upstream_port, struct bt_port *downstream_port,
 		void *data);
+typedef void (* bt_graph_listener_removed)(void *data);
 
 extern struct bt_graph *bt_graph_create(void);
 
+extern enum bt_graph_status bt_graph_add_component(
+		struct bt_graph *graph,
+		struct bt_component_class *component_class,
+		const char *name, struct bt_value *params,
+		struct bt_component **component);
+
+extern enum bt_graph_status bt_graph_add_component_with_init_method_data(
+		struct bt_graph *graph,
+		struct bt_component_class *component_class,
+		const char *name, struct bt_value *params,
+		void *init_method_data,
+		struct bt_component **component);
+
 /**
  * Creates a connection between two components using the two ports specified
  * and adds the connection and components (if not already added) to the graph.
  */
-extern struct bt_connection *bt_graph_connect_ports(struct bt_graph *graph,
-		struct bt_port *upstream,
-		struct bt_port *downstream);
+extern enum bt_graph_status bt_graph_connect_ports(struct bt_graph *graph,
+		struct bt_port *upstream, struct bt_port *downstream,
+		struct bt_connection **connection);
 
 /**
  * Run graph to completion or until a single sink is left and "AGAIN" is received.
@@ -93,16 +111,20 @@ extern enum bt_graph_status bt_graph_run(struct bt_graph *graph);
 extern enum bt_graph_status bt_graph_consume(struct bt_graph *graph);
 
 extern int bt_graph_add_port_added_listener(struct bt_graph *graph,
-		bt_graph_port_added_listener listener, void *data);
+		bt_graph_port_added_listener listener,
+		bt_graph_listener_removed listener_removed, void *data);
 
 extern int bt_graph_add_port_removed_listener(struct bt_graph *graph,
-		bt_graph_port_removed_listener listener, void *data);
+		bt_graph_port_removed_listener listener,
+		bt_graph_listener_removed listener_removed, void *data);
 
 extern int bt_graph_add_ports_connected_listener(struct bt_graph *graph,
-		bt_graph_ports_connected_listener listener, void *data);
+		bt_graph_ports_connected_listener listener,
+		bt_graph_listener_removed listener_removed, void *data);
 
 extern int bt_graph_add_ports_disconnected_listener(struct bt_graph *graph,
-		bt_graph_ports_disconnected_listener listener, void *data);
+		bt_graph_ports_disconnected_listener listener,
+		bt_graph_listener_removed listener_removed, void *data);
 
 extern enum bt_graph_status bt_graph_cancel(struct bt_graph *graph);
 extern bt_bool bt_graph_is_canceled(struct bt_graph *graph);