X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fgraph%2Fgraph.c;h=f7b02a10bece15a7914d8612e362f058328bcc6e;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=f0a919f681705e7b27661e6b98af61ec2c6c8cce;hpb=4725a2013cb518374822ccb490610b45f74dbdbf;p=babeltrace.git

diff --git a/lib/graph/graph.c b/lib/graph/graph.c
index f0a919f6..f7b02a10 100644
--- a/lib/graph/graph.c
+++ b/lib/graph/graph.c
@@ -22,35 +22,36 @@
  */
 
 #define BT_LOG_TAG "GRAPH"
-#include <babeltrace/lib-logging-internal.h>
-
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/assert-pre-internal.h>
-#include <babeltrace/graph/component-internal.h>
-#include <babeltrace/graph/graph.h>
-#include <babeltrace/graph/graph-const.h>
-#include <babeltrace/graph/graph-internal.h>
-#include <babeltrace/graph/connection-internal.h>
-#include <babeltrace/graph/component-sink-internal.h>
-#include <babeltrace/graph/component-source-const.h>
-#include <babeltrace/graph/component-filter-const.h>
-#include <babeltrace/graph/port-const.h>
-#include <babeltrace/graph/message-internal.h>
-#include <babeltrace/graph/message-event-internal.h>
-#include <babeltrace/graph/message-packet-internal.h>
-#include <babeltrace/compiler-internal.h>
-#include <babeltrace/common-internal.h>
-#include <babeltrace/types.h>
-#include <babeltrace/value.h>
-#include <babeltrace/value-const.h>
-#include <babeltrace/value-internal.h>
+#include <babeltrace2/lib-logging-internal.h>
+
+#include <babeltrace2/assert-internal.h>
+#include <babeltrace2/assert-pre-internal.h>
+#include <babeltrace2/graph/component-internal.h>
+#include <babeltrace2/graph/graph.h>
+#include <babeltrace2/graph/graph-const.h>
+#include <babeltrace2/graph/graph-internal.h>
+#include <babeltrace2/graph/connection-internal.h>
+#include <babeltrace2/graph/component-sink-internal.h>
+#include <babeltrace2/graph/component-source-const.h>
+#include <babeltrace2/graph/component-filter-const.h>
+#include <babeltrace2/graph/port-const.h>
+#include <babeltrace2/graph/message-internal.h>
+#include <babeltrace2/graph/message-event-internal.h>
+#include <babeltrace2/graph/message-packet-internal.h>
+#include <babeltrace2/compiler-internal.h>
+#include <babeltrace2/common-internal.h>
+#include <babeltrace2/types.h>
+#include <babeltrace2/value.h>
+#include <babeltrace2/value-const.h>
+#include <babeltrace2/value-internal.h>
 #include <unistd.h>
 #include <glib.h>
 
-typedef void (*port_added_func_t)(const void *, const void *, void *);
+typedef enum bt_graph_listener_status (*port_added_func_t)(
+		const void *, const void *, void *);
 
-typedef void (*ports_connected_func_t)(const void *, const void *, const void *,
-		const void *, void *);
+typedef enum bt_graph_listener_status (*ports_connected_func_t)(
+		const void *, const void *, const void *, const void *, void *);
 
 typedef enum bt_self_component_status (*comp_init_method_t)(const void *,
 		const void *, void *);
@@ -82,6 +83,9 @@ struct bt_graph_listener_ports_connected {
 	do {								\
 		size_t i;						\
 									\
+		if (!_listeners) {					\
+			break;						\
+		}							\
 		for (i = 0; i < (_listeners)->len; i++) {		\
 			_type *listener =				\
 				&g_array_index((_listeners), _type, i);	\
@@ -233,14 +237,14 @@ static
 void destroy_message_packet_begin(struct bt_message *msg,
 		struct bt_graph *graph)
 {
-	bt_message_packet_beginning_destroy(msg);
+	bt_message_packet_destroy(msg);
 }
 
 static
 void destroy_message_packet_end(struct bt_message *msg,
 		struct bt_graph *graph)
 {
-	bt_message_packet_end_destroy(msg);
+	bt_message_packet_destroy(msg);
 }
 
 static
@@ -394,6 +398,7 @@ enum bt_graph_status bt_graph_connect_ports(
 		const struct bt_connection **user_connection)
 {
 	enum bt_graph_status status = BT_GRAPH_STATUS_OK;
+	enum bt_graph_listener_status listener_status;
 	struct bt_connection *connection = NULL;
 	struct bt_port *upstream_port = (void *) upstream_port_out;
 	struct bt_port *downstream_port = (void *) downstream_port_in;
@@ -406,8 +411,9 @@ enum bt_graph_status bt_graph_connect_ports(
 	BT_ASSERT_PRE_NON_NULL(upstream_port, "Upstream port");
 	BT_ASSERT_PRE_NON_NULL(downstream_port, "Downstream port port");
 	BT_ASSERT_PRE(!graph->canceled, "Graph is canceled: %!+g", graph);
-	BT_ASSERT_PRE(!graph->is_configured,
-		"Graph is already configured: %!+g", graph);
+	BT_ASSERT_PRE(
+		graph->config_state == BT_GRAPH_CONFIGURATION_STATE_CONFIGURING,
+		"Graph is not in the \"configuring\" state: %!+g", graph);
 	BT_ASSERT_PRE(!bt_port_is_connected(upstream_port),
 		"Upstream port is already connected: %!+p", upstream_port);
 	BT_ASSERT_PRE(!bt_port_is_connected(downstream_port),
@@ -527,7 +533,12 @@ enum bt_graph_status bt_graph_connect_ports(
 	 * Notify the graph's creator that both ports are connected.
 	 */
 	BT_LOGD_STR("Notifying graph's user that new component ports are connected.");
-	bt_graph_notify_ports_connected(graph, upstream_port, downstream_port);
+	listener_status = bt_graph_notify_ports_connected(graph, upstream_port, downstream_port);
+	if (listener_status != BT_GRAPH_LISTENER_STATUS_OK) {
+		status = (int) listener_status;
+		goto end;
+	}
+
 	connection->notified_graph_ports_connected = true;
 	BT_LIB_LOGD("Connected component ports within graph: "
 		"%![graph-]+g, %![up-comp-]+c, %![down-comp-]+c, "
@@ -542,6 +553,10 @@ enum bt_graph_status bt_graph_connect_ports(
 	}
 
 end:
+	if (status != BT_GRAPH_STATUS_OK) {
+		bt_graph_make_faulty(graph);
+	}
+
 	bt_object_put_ref(connection);
 	(void) init_can_consume;
 	bt_graph_set_can_consume(graph, init_can_consume);
@@ -679,23 +694,39 @@ enum bt_graph_status bt_graph_consume(struct bt_graph *graph)
 	BT_ASSERT_PRE(!graph->canceled, "Graph is canceled: %!+g", graph);
 	BT_ASSERT_PRE(graph->can_consume,
 		"Cannot consume graph in its current state: %!+g", graph);
+	BT_ASSERT_PRE(graph->config_state != BT_GRAPH_CONFIGURATION_STATE_FAULTY,
+		"Graph is in a faulty state: %!+g", graph);
 	bt_graph_set_can_consume(graph, false);
-	bt_graph_set_is_configured(graph, true);
+	status = bt_graph_configure(graph);
+	if (unlikely(status)) {
+		/* bt_graph_configure() logs errors */
+		goto end;
+	}
+
 	status = consume_no_check(graph);
 	bt_graph_set_can_consume(graph, true);
+
+end:
 	return status;
 }
 
 enum bt_graph_status bt_graph_run(struct bt_graph *graph)
 {
-	enum bt_graph_status status = BT_GRAPH_STATUS_OK;
+	enum bt_graph_status status;
 
 	BT_ASSERT_PRE_NON_NULL(graph, "Graph");
 	BT_ASSERT_PRE(!graph->canceled, "Graph is canceled: %!+g", graph);
 	BT_ASSERT_PRE(graph->can_consume,
 		"Cannot consume graph in its current state: %!+g", graph);
+	BT_ASSERT_PRE(graph->config_state != BT_GRAPH_CONFIGURATION_STATE_FAULTY,
+		"Graph is in a faulty state: %!+g", graph);
 	bt_graph_set_can_consume(graph, false);
-	bt_graph_set_is_configured(graph, true);
+	status = bt_graph_configure(graph);
+	if (unlikely(status)) {
+		/* bt_graph_configure() logs errors */
+		goto end;
+	}
+
 	BT_LIB_LOGV("Running graph: %!+g", graph);
 
 	do {
@@ -728,8 +759,6 @@ enum bt_graph_status bt_graph_run(struct bt_graph *graph)
 			if (graph->sinks_to_consume->length > 1) {
 				status = BT_GRAPH_STATUS_OK;
 			}
-		} else if (status == BT_GRAPH_STATUS_NO_SINK) {
-			goto end;
 		}
 	} while (status == BT_GRAPH_STATUS_OK);
 
@@ -1029,11 +1058,13 @@ bt_graph_add_filter_sink_component_ports_connected_listener(
 }
 
 BT_HIDDEN
-void bt_graph_notify_port_added(struct bt_graph *graph, struct bt_port *port)
+enum bt_graph_listener_status bt_graph_notify_port_added(
+		struct bt_graph *graph, struct bt_port *port)
 {
 	uint64_t i;
 	GArray *listeners;
 	struct bt_component *comp;
+	enum bt_graph_listener_status status = BT_GRAPH_LISTENER_STATUS_OK;
 
 	BT_ASSERT(graph);
 	BT_ASSERT(port);
@@ -1091,19 +1122,28 @@ void bt_graph_notify_port_added(struct bt_graph *graph, struct bt_port *port)
 			&g_array_index(listeners,
 				struct bt_graph_listener_port_added, i);
 
+
 		BT_ASSERT(listener->func);
-		listener->func(comp, port, listener->base.data);
+		status = listener->func(comp, port, listener->base.data);
+		if (status != BT_GRAPH_LISTENER_STATUS_OK) {
+			goto end;
+		}
 	}
+
+end:
+	return status;
 }
 
 BT_HIDDEN
-void bt_graph_notify_ports_connected(struct bt_graph *graph,
-		struct bt_port *upstream_port, struct bt_port *downstream_port)
+enum bt_graph_listener_status bt_graph_notify_ports_connected(
+		struct bt_graph *graph, struct bt_port *upstream_port,
+		struct bt_port *downstream_port)
 {
 	uint64_t i;
 	GArray *listeners;
 	struct bt_component *upstream_comp;
 	struct bt_component *downstream_comp;
+	enum bt_graph_listener_status status = BT_GRAPH_LISTENER_STATUS_OK;
 
 	BT_ASSERT(graph);
 	BT_ASSERT(upstream_port);
@@ -1161,9 +1201,15 @@ void bt_graph_notify_ports_connected(struct bt_graph *graph,
 				struct bt_graph_listener_ports_connected, i);
 
 		BT_ASSERT(listener->func);
-		listener->func(upstream_comp, downstream_comp,
+		status = listener->func(upstream_comp, downstream_comp,
 			upstream_port, downstream_port, listener->base.data);
+		if (status != BT_GRAPH_LISTENER_STATUS_OK) {
+			goto end;
+		}
 	}
+
+end:
+	return status;
 }
 
 enum bt_graph_status bt_graph_cancel(struct bt_graph *graph)
@@ -1234,8 +1280,9 @@ enum bt_graph_status add_component_with_init_method_data(
 	BT_ASSERT_PRE_NON_NULL(graph, "Graph");
 	BT_ASSERT_PRE_NON_NULL(name, "Name");
 	BT_ASSERT_PRE(!graph->canceled, "Graph is canceled: %!+g", graph);
-	BT_ASSERT_PRE(!graph->is_configured,
-		"Graph is already configured: %!+g", graph);
+	BT_ASSERT_PRE(
+		graph->config_state == BT_GRAPH_CONFIGURATION_STATE_CONFIGURING,
+		"Graph is not in the \"configuring\" state: %!+g", graph);
 	BT_ASSERT_PRE(!component_name_exists(graph, name),
 		"Duplicate component name: %!+g, name=\"%s\"", graph, name);
 	BT_ASSERT_PRE(!params || bt_value_is_map(params),
@@ -1273,6 +1320,7 @@ enum bt_graph_status add_component_with_init_method_data(
 	 */
 	g_ptr_array_add(graph->components, component);
 	bt_component_set_graph(component, graph);
+	bt_value_freeze(params);
 
 	if (init_method) {
 		BT_LOGD_STR("Calling user's initialization method.");
@@ -1321,6 +1369,10 @@ enum bt_graph_status add_component_with_init_method_data(
 	}
 
 end:
+	if (graph_status != BT_GRAPH_STATUS_OK) {
+		bt_graph_make_faulty(graph);
+	}
+
 	bt_object_put_ref(component);
 	bt_object_put_ref(new_params);
 	(void) init_can_consume;