X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fgraph.c;h=b545a8ef234b247e9a0731902c4fb9d732bd6d41;hb=43c59509042845f8d42c3e99ec74d45fa2dc0908;hp=8416b1f6bbe1c6c06d788463d616fdbdd14e040b;hpb=2945edfe752782d2528af21bdbd3bbfef4cd51ca;p=babeltrace.git

diff --git a/src/lib/graph/graph.c b/src/lib/graph/graph.c
index 8416b1f6..b545a8ef 100644
--- a/src/lib/graph/graph.c
+++ b/src/lib/graph/graph.c
@@ -28,16 +28,13 @@
 #include "lib/assert-pre.h"
 #include "lib/assert-post.h"
 #include <babeltrace2/graph/graph.h>
-#include <babeltrace2/graph/graph-const.h>
-#include <babeltrace2/graph/component-source-const.h>
-#include <babeltrace2/graph/component-filter-const.h>
-#include <babeltrace2/graph/port-const.h>
+#include <babeltrace2/graph/component.h>
+#include <babeltrace2/graph/port.h>
 #include "lib/graph/message/message.h"
 #include "compat/compiler.h"
 #include "common/common.h"
 #include <babeltrace2/types.h>
 #include <babeltrace2/value.h>
-#include <babeltrace2/value-const.h>
 #include "lib/value.h"
 #include <unistd.h>
 #include <stdbool.h>
@@ -58,14 +55,9 @@ typedef enum bt_graph_listener_func_status
 typedef enum bt_component_class_initialize_method_status
 (*comp_init_method_t)(const void *, void *, const void *, void *);
 
-struct bt_graph_listener {
-	bt_graph_listener_removed_func removed;
-	void *data;
-};
-
 struct bt_graph_listener_port_added {
-	struct bt_graph_listener base;
 	port_added_func_t func;
+	void *data;
 };
 
 #define INIT_LISTENERS_ARRAY(_type, _listeners)				\
@@ -77,23 +69,6 @@ struct bt_graph_listener_port_added {
 		}							\
 	} while (0)
 
-#define CALL_REMOVE_LISTENERS(_type, _listeners)			\
-	do {								\
-		size_t i;						\
-									\
-		if (!_listeners) {					\
-			break;						\
-		}							\
-		for (i = 0; i < (_listeners)->len; i++) {		\
-			_type *listener =				\
-				&g_array_index((_listeners), _type, i);	\
-									\
-			if (listener->base.removed) {			\
-				listener->base.removed(listener->base.data); \
-			}						\
-		}							\
-	} while (0)
-
 static
 void destroy_graph(struct bt_object *obj)
 {
@@ -129,16 +104,6 @@ void destroy_graph(struct bt_object *obj)
 	obj->ref_count++;
 	graph->config_state = BT_GRAPH_CONFIGURATION_STATE_DESTROYING;
 
-	/* Call all remove listeners */
-	CALL_REMOVE_LISTENERS(struct bt_graph_listener_port_added,
-		graph->listeners.source_output_port_added);
-	CALL_REMOVE_LISTENERS(struct bt_graph_listener_port_added,
-		graph->listeners.filter_output_port_added);
-	CALL_REMOVE_LISTENERS(struct bt_graph_listener_port_added,
-		graph->listeners.filter_input_port_added);
-	CALL_REMOVE_LISTENERS(struct bt_graph_listener_port_added,
-		graph->listeners.sink_input_port_added);
-
 	if (graph->messages) {
 		g_ptr_array_free(graph->messages, TRUE);
 		graph->messages = NULL;
@@ -465,7 +430,6 @@ enum bt_graph_connect_ports_status bt_graph_connect_ports(
 	if (user_connection) {
 		/* Move reference to user */
 		*user_connection = connection;
-		connection = NULL;
 	}
 
 end:
@@ -710,25 +674,17 @@ enum bt_graph_add_listener_status
 bt_graph_add_source_component_output_port_added_listener(
 		struct bt_graph *graph,
 		bt_graph_source_component_output_port_added_listener_func func,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		bt_listener_id *out_listener_id)
+		void *data, bt_listener_id *out_listener_id)
 {
 	struct bt_graph_listener_port_added listener = {
-		.base = {
-			.removed = listener_removed,
-			.data = data,
-		},
 		.func = (port_added_func_t) func,
+		.data = data,
 	};
 	bt_listener_id listener_id;
 
 	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(graph, "Graph");
 	BT_ASSERT_PRE_NON_NULL(func, "Listener");
-	BT_ASSERT_PRE_NON_NULL(func, "\"Listener removed\" listener");
-	BT_ASSERT_PRE(!graph->in_remove_listener,
-		"Graph currently executing a \"listener removed\" listener: "
-		"%!+g", graph);
 	g_array_append_val(graph->listeners.source_output_port_added, listener);
 	listener_id = graph->listeners.source_output_port_added->len - 1;
 	BT_LIB_LOGD("Added \"source component output port added\" listener to graph: "
@@ -746,25 +702,17 @@ enum bt_graph_add_listener_status
 bt_graph_add_filter_component_output_port_added_listener(
 		struct bt_graph *graph,
 		bt_graph_filter_component_output_port_added_listener_func func,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		bt_listener_id *out_listener_id)
+		void *data, bt_listener_id *out_listener_id)
 {
 	struct bt_graph_listener_port_added listener = {
-		.base = {
-			.removed = listener_removed,
-			.data = data,
-		},
 		.func = (port_added_func_t) func,
+		.data = data,
 	};
 	bt_listener_id listener_id;
 
 	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(graph, "Graph");
 	BT_ASSERT_PRE_NON_NULL(func, "Listener");
-	BT_ASSERT_PRE_NON_NULL(func, "\"Listener removed\" listener");
-	BT_ASSERT_PRE(!graph->in_remove_listener,
-		"Graph currently executing a \"listener removed\" listener: "
-		"%!+g", graph);
 	g_array_append_val(graph->listeners.filter_output_port_added, listener);
 	listener_id = graph->listeners.filter_output_port_added->len - 1;
 	BT_LIB_LOGD("Added \"filter component output port added\" listener to graph: "
@@ -782,25 +730,17 @@ enum bt_graph_add_listener_status
 bt_graph_add_filter_component_input_port_added_listener(
 		struct bt_graph *graph,
 		bt_graph_filter_component_input_port_added_listener_func func,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		bt_listener_id *out_listener_id)
+		void *data, bt_listener_id *out_listener_id)
 {
 	struct bt_graph_listener_port_added listener = {
-		.base = {
-			.removed = listener_removed,
-			.data = data,
-		},
 		.func = (port_added_func_t) func,
+		.data = data,
 	};
 	bt_listener_id listener_id;
 
 	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(graph, "Graph");
 	BT_ASSERT_PRE_NON_NULL(func, "Listener");
-	BT_ASSERT_PRE_NON_NULL(func, "\"Listener removed\" listener");
-	BT_ASSERT_PRE(!graph->in_remove_listener,
-		"Graph currently executing a \"listener removed\" listener: "
-		"%!+g", graph);
 	g_array_append_val(graph->listeners.filter_input_port_added, listener);
 	listener_id = graph->listeners.filter_input_port_added->len - 1;
 	BT_LIB_LOGD("Added \"filter component input port added\" listener to graph: "
@@ -818,25 +758,17 @@ enum bt_graph_add_listener_status
 bt_graph_add_sink_component_input_port_added_listener(
 		struct bt_graph *graph,
 		bt_graph_sink_component_input_port_added_listener_func func,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		bt_listener_id *out_listener_id)
+		void *data, bt_listener_id *out_listener_id)
 {
 	struct bt_graph_listener_port_added listener = {
-		.base = {
-			.removed = listener_removed,
-			.data = data,
-		},
 		.func = (port_added_func_t) func,
+		.data = data,
 	};
 	bt_listener_id listener_id;
 
 	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(graph, "Graph");
 	BT_ASSERT_PRE_NON_NULL(func, "Listener");
-	BT_ASSERT_PRE_NON_NULL(func, "\"Listener removed\" listener");
-	BT_ASSERT_PRE(!graph->in_remove_listener,
-		"Graph currently executing a \"listener removed\" listener: "
-		"%!+g", graph);
 	g_array_append_val(graph->listeners.sink_input_port_added, listener);
 	listener_id = graph->listeners.sink_input_port_added->len - 1;
 	BT_LIB_LOGD("Added \"sink component input port added\" listener to graph: "
@@ -917,7 +849,7 @@ enum bt_graph_listener_func_status bt_graph_notify_port_added(
 
 
 		BT_ASSERT(listener->func);
-		status = listener->func(comp, port, listener->base.data);
+		status = listener->func(comp, port, listener->data);
 		BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS(status);
 		if (status != BT_FUNC_STATUS_OK) {
 			goto end;
@@ -1084,7 +1016,6 @@ int add_component_with_init_method_data(
 	if (user_component) {
 		/* Move reference to user */
 		*user_component = component;
-		component = NULL;
 	}
 
 end:
@@ -1258,11 +1189,10 @@ enum bt_graph_add_interrupter_status bt_graph_add_interrupter(
 	return BT_FUNC_STATUS_OK;
 }
 
-void bt_graph_interrupt(struct bt_graph *graph)
+struct bt_interrupter *bt_graph_borrow_default_interrupter(bt_graph *graph)
 {
 	BT_ASSERT_PRE_NON_NULL(graph, "Graph");
-	bt_interrupter_set(graph->default_interrupter);
-	BT_LIB_LOGI("Interrupted graph: %!+g", graph);
+	return graph->default_interrupter;
 }
 
 void bt_graph_get_ref(const struct bt_graph *graph)