X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fgraph%2Fgraph.h;h=029bfda2142cddf5ad66d93f62b886bc0717030c;hb=e2f7325d1e58710ee928373592adcee466f93d06;hp=a5077c4901991bcc9e343f6aaf4f3a048d375fb3;hpb=36712f1d9ad9269638e493ca36a50979fe4da989;p=babeltrace.git

diff --git a/include/babeltrace/graph/graph.h b/include/babeltrace/graph/graph.h
index a5077c49..029bfda2 100644
--- a/include/babeltrace/graph/graph.h
+++ b/include/babeltrace/graph/graph.h
@@ -2,12 +2,9 @@
 #define BABELTRACE_GRAPH_GRAPH_H
 
 /*
- * BabelTrace - Babeltrace Graph Interface
- *
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2017 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
@@ -27,98 +24,257 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/graph/component.h>
+/* For bt_bool */
 #include <babeltrace/types.h>
 
+/* For enum bt_graph_status */
+#include <babeltrace/graph/graph-const.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct bt_port;
+struct bt_component;
+struct bt_component_class;
+struct bt_component_class_filter;
+struct bt_component_class_sink;
+struct bt_component_class_source;
+struct bt_component_filter;
+struct bt_component_sink;
+struct bt_component_source;
 struct bt_connection;
+struct bt_graph;
+struct bt_port_input;
+struct bt_port_output;
+struct bt_value;
+
+typedef void (*bt_graph_filter_component_input_port_added_listener_func)(
+		const struct bt_component_filter *component,
+		const struct bt_port_input *port, void *data);
+
+typedef void (*bt_graph_sink_component_input_port_added_listener_func)(
+		const struct bt_component_sink *component,
+		const struct bt_port_input *port, void *data);
+
+typedef void (*bt_graph_source_component_output_port_added_listener_func)(
+		const struct bt_component_source *component,
+		const struct bt_port_output *port, void *data);
+
+typedef void (*bt_graph_filter_component_output_port_added_listener_func)(
+		const struct bt_component_filter *component,
+		const struct bt_port_output *port, void *data);
+
+typedef void (*bt_graph_filter_component_input_port_removed_listener_func)(
+		const struct bt_component_filter *component,
+		const struct bt_port_input *port, void *data);
 
-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. */
-	BT_GRAPH_STATUS_AGAIN = 11,
-	/** Downstream component does not support multiple inputs. */
-	BT_GRAPH_STATUS_END = 1,
-	BT_GRAPH_STATUS_OK = 0,
-	/** 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_NOMEM = -12,
-};
-
-typedef void (*bt_graph_port_added_listener)(struct bt_port *port,
+typedef void (*bt_graph_sink_component_input_port_removed_listener_func)(
+		const struct bt_component_sink *component,
+		const struct bt_port_input *port, void *data);
+
+typedef void (*bt_graph_source_component_output_port_removed_listener_func)(
+		const struct bt_component_source *component,
+		const struct bt_port_output *port, void *data);
+
+typedef void (*bt_graph_filter_component_output_port_removed_listener_func)(
+		const struct bt_component_filter *component,
+		const struct bt_port_output *port, void *data);
+
+typedef void (*bt_graph_source_filter_component_ports_connected_listener_func)(
+		const struct bt_component_source *source_component,
+		const struct bt_component_filter *filter_component,
+		const struct bt_port_output *upstream_port,
+		const struct bt_port_input *downstream_port, void *data);
+
+typedef void (*bt_graph_source_sink_component_ports_connected_listener_func)(
+		const struct bt_component_source *source_component,
+		const struct bt_component_sink *sink_component,
+		const struct bt_port_output *upstream_port,
+		const struct bt_port_input *downstream_port, void *data);
+
+typedef void (*bt_graph_filter_sink_component_ports_connected_listener_func)(
+		const struct bt_component_filter *filter_component,
+		const struct bt_component_sink *sink_component,
+		const struct bt_port_output *upstream_port,
+		const struct bt_port_input *downstream_port, void *data);
+
+typedef void (*bt_graph_source_filter_component_ports_disconnected_listener_func)(
+		const struct bt_component_source *source_component,
+		const struct bt_component_filter *filter_component,
+		const struct bt_port_output *upstream_port,
+		const struct bt_port_input *downstream_port,
 		void *data);
-typedef void (*bt_graph_port_removed_listener)(struct bt_component *component,
-		struct bt_port *port, void *data);
-typedef void (*bt_graph_ports_connected_listener)(struct bt_port *upstream_port,
-		struct bt_port *downstream_port, void *data);
-typedef void (*bt_graph_ports_disconnected_listener)(
-		struct bt_component *upstream_component,
-		struct bt_component *downstream_component,
-		struct bt_port *upstream_port, struct bt_port *downstream_port,
+
+typedef void (*bt_graph_source_sink_component_ports_disconnected_listener_func)(
+		const struct bt_component_source *source_component,
+		const struct bt_component_sink *sink_component,
+		const struct bt_port_output *upstream_port,
+		const struct bt_port_input *downstream_port,
 		void *data);
 
+typedef void (*bt_graph_filter_sink_component_ports_disconnected_listener_func)(
+		const struct bt_component_filter *filter_component,
+		const struct bt_component_sink *sink_component,
+		const struct bt_port_output *upstream_port,
+		const struct bt_port_input *downstream_port,
+		void *data);
+
+typedef void (* bt_graph_listener_removed_func)(void *data);
+
 extern struct bt_graph *bt_graph_create(void);
 
-extern enum bt_graph_status bt_graph_add_component(
+extern enum bt_graph_status bt_graph_add_source_component(
 		struct bt_graph *graph,
-		struct bt_component_class *component_class,
-		const char *name, struct bt_value *params,
-		struct bt_component **component);
+		const struct bt_component_class_source *component_class,
+		const char *name, const struct bt_value *params,
+		const struct bt_component_source **component);
 
-extern enum bt_graph_status bt_graph_add_component_with_init_method_data(
+extern enum bt_graph_status
+bt_graph_add_source_component_with_init_method_data(
 		struct bt_graph *graph,
-		struct bt_component_class *component_class,
-		const char *name, struct bt_value *params,
+		const struct bt_component_class_source *component_class,
+		const char *name, const struct bt_value *params,
 		void *init_method_data,
-		struct bt_component **component);
+		const struct bt_component_source **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 enum bt_graph_status bt_graph_connect_ports(struct bt_graph *graph,
-		struct bt_port *upstream, struct bt_port *downstream,
-		struct bt_connection **connection);
+extern enum bt_graph_status bt_graph_add_filter_component(
+		struct bt_graph *graph,
+		const struct bt_component_class_filter *component_class,
+		const char *name, const struct bt_value *params,
+		const struct bt_component_filter **component);
+
+extern enum bt_graph_status
+bt_graph_add_filter_component_with_init_method_data(
+		struct bt_graph *graph,
+		const struct bt_component_class_filter *component_class,
+		const char *name, const struct bt_value *params,
+		void *init_method_data,
+		const struct bt_component_filter **component);
+
+extern enum bt_graph_status bt_graph_add_sink_component(
+		struct bt_graph *graph,
+		const struct bt_component_class_sink *component_class,
+		const char *name, const struct bt_value *params,
+		const struct bt_component_sink **component);
+
+extern enum bt_graph_status
+bt_graph_add_sink_component_with_init_method_data(
+		struct bt_graph *graph,
+		const struct bt_component_class_sink *component_class,
+		const char *name, const struct bt_value *params,
+		void *init_method_data,
+		const struct bt_component_sink **component);
+
+extern enum bt_graph_status bt_graph_connect_ports(
+		struct bt_graph *graph,
+		const struct bt_port_output *upstream,
+		const struct bt_port_input *downstream,
+		const struct bt_connection **connection);
 
-/**
- * Run graph to completion or until a single sink is left and "AGAIN" is received.
- *
- * Runs "bt_component_sink_consume()" on all sinks in round-robin until they all
- * indicate that the end is reached or that an error occured.
- */
 extern enum bt_graph_status bt_graph_run(struct bt_graph *graph);
 
-/**
- * Runs "bt_component_sink_consume()" on the graph's sinks. Each invokation will
- * invoke "bt_component_sink_consume()" on the next sink, in round-robin, until
- * they all indicated that the end is reached.
- */
-extern enum bt_graph_status bt_graph_consume(struct bt_graph *graph);
+extern enum bt_graph_status bt_graph_consume(
+		struct bt_graph *graph);
+
+extern enum bt_graph_status
+bt_graph_add_filter_component_input_port_added_listener(
+		struct bt_graph *graph,
+		bt_graph_filter_component_input_port_added_listener_func listener,
+		bt_graph_listener_removed_func listener_removed, void *data,
+		int *listener_id);
+
+extern enum bt_graph_status
+bt_graph_add_sink_component_input_port_added_listener(
+		struct bt_graph *graph,
+		bt_graph_sink_component_input_port_added_listener_func listener,
+		bt_graph_listener_removed_func listener_removed, void *data,
+		int *listener_id);
+
+extern enum bt_graph_status
+bt_graph_add_source_component_output_port_added_listener(
+		struct bt_graph *graph,
+		bt_graph_source_component_output_port_added_listener_func listener,
+		bt_graph_listener_removed_func listener_removed, void *data,
+		int *listener_id);
+
+extern enum bt_graph_status
+bt_graph_add_filter_component_output_port_added_listener(
+		struct bt_graph *graph,
+		bt_graph_filter_component_output_port_added_listener_func listener,
+		bt_graph_listener_removed_func listener_removed, void *data,
+		int *listener_id);
+
+extern enum bt_graph_status
+bt_graph_add_filter_component_input_port_removed_listener(
+		struct bt_graph *graph,
+		bt_graph_filter_component_input_port_removed_listener_func listener,
+		bt_graph_listener_removed_func listener_removed, void *data,
+		int *listener_id);
 
-extern int bt_graph_add_port_added_listener(struct bt_graph *graph,
-		bt_graph_port_added_listener listener, void *data);
+extern enum bt_graph_status
+bt_graph_add_sink_component_input_port_removed_listener(
+		struct bt_graph *graph,
+		bt_graph_sink_component_input_port_removed_listener_func listener,
+		bt_graph_listener_removed_func listener_removed, void *data,
+		int *listener_id);
+
+extern enum bt_graph_status
+bt_graph_add_source_component_output_port_removed_listener(
+		struct bt_graph *graph,
+		bt_graph_source_component_output_port_removed_listener_func listener,
+		bt_graph_listener_removed_func listener_removed, void *data,
+		int *listener_id);
+
+extern enum bt_graph_status
+bt_graph_add_filter_component_output_port_removed_listener(
+		struct bt_graph *graph,
+		bt_graph_filter_component_output_port_removed_listener_func listener,
+		bt_graph_listener_removed_func listener_removed, void *data,
+		int *listener_id);
+
+extern enum bt_graph_status
+bt_graph_add_source_filter_component_ports_connected_listener(
+		struct bt_graph *graph,
+		bt_graph_source_filter_component_ports_connected_listener_func listener,
+		bt_graph_listener_removed_func listener_removed, void *data,
+		int *listener_id);
 
-extern int bt_graph_add_port_removed_listener(struct bt_graph *graph,
-		bt_graph_port_removed_listener listener, void *data);
+extern enum bt_graph_status
+bt_graph_add_source_sink_component_ports_connected_listener(
+		struct bt_graph *graph,
+		bt_graph_source_sink_component_ports_connected_listener_func listener,
+		bt_graph_listener_removed_func listener_removed, void *data,
+		int *listener_id);
+
+extern enum bt_graph_status
+bt_graph_add_filter_sink_component_ports_connected_listener(
+		struct bt_graph *graph,
+		bt_graph_filter_sink_component_ports_connected_listener_func listener,
+		bt_graph_listener_removed_func listener_removed, void *data,
+		int *listener_id);
 
-extern int bt_graph_add_ports_connected_listener(struct bt_graph *graph,
-		bt_graph_ports_connected_listener listener, void *data);
+extern enum bt_graph_status
+bt_graph_add_source_filter_component_ports_disconnected_listener(
+		struct bt_graph *graph,
+		bt_graph_source_filter_component_ports_disconnected_listener_func listener,
+		bt_graph_listener_removed_func listener_removed, void *data,
+		int *listener_id);
 
-extern int bt_graph_add_ports_disconnected_listener(struct bt_graph *graph,
-		bt_graph_ports_disconnected_listener listener, void *data);
+extern enum bt_graph_status
+bt_graph_add_source_sink_component_ports_disconnected_listener(
+		struct bt_graph *graph,
+		bt_graph_source_sink_component_ports_disconnected_listener_func listener,
+		bt_graph_listener_removed_func listener_removed, void *data,
+		int *listener_id);
+
+extern enum bt_graph_status
+bt_graph_add_filter_sink_component_ports_disconnected_listener(
+		struct bt_graph *graph,
+		bt_graph_filter_sink_component_ports_disconnected_listener_func listener,
+		bt_graph_listener_removed_func listener_removed, void *data,
+		int *listener_id);
 
 extern enum bt_graph_status bt_graph_cancel(struct bt_graph *graph);
-extern bt_bool bt_graph_is_canceled(struct bt_graph *graph);
 
 #ifdef __cplusplus
 }