#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>
#include <glib.h>
#include "component-class-sink-simple.h"
typedef enum bt_graph_listener_func_status
(*port_added_func_t)(const void *, const void *, void *);
-typedef enum bt_graph_listener_func_status
-(*ports_connected_func_t)(const void *, const void *, const void *,
- const void *, void *);
-
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;
-};
-
-struct bt_graph_listener_ports_connected {
- struct bt_graph_listener base;
- ports_connected_func_t func;
+ void *data;
};
#define INIT_LISTENERS_ARRAY(_type, _listeners) \
} \
} 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)
{
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);
- CALL_REMOVE_LISTENERS(struct bt_graph_listener_ports_connected,
- graph->listeners.source_filter_ports_connected);
- CALL_REMOVE_LISTENERS(struct bt_graph_listener_ports_connected,
- graph->listeners.filter_filter_ports_connected);
- CALL_REMOVE_LISTENERS(struct bt_graph_listener_ports_connected,
- graph->listeners.source_sink_ports_connected);
- CALL_REMOVE_LISTENERS(struct bt_graph_listener_ports_connected,
- graph->listeners.filter_sink_ports_connected);
-
if (graph->messages) {
g_ptr_array_free(graph->messages, TRUE);
graph->messages = NULL;
graph->listeners.sink_input_port_added = NULL;
}
- if (graph->listeners.source_filter_ports_connected) {
- g_array_free(graph->listeners.source_filter_ports_connected,
- TRUE);
- graph->listeners.source_filter_ports_connected = NULL;
- }
-
- if (graph->listeners.filter_filter_ports_connected) {
- g_array_free(graph->listeners.filter_filter_ports_connected,
- TRUE);
- graph->listeners.filter_filter_ports_connected = NULL;
- }
-
- if (graph->listeners.source_sink_ports_connected) {
- g_array_free(graph->listeners.source_sink_ports_connected,
- TRUE);
- graph->listeners.source_sink_ports_connected = NULL;
- }
-
- if (graph->listeners.filter_sink_ports_connected) {
- g_array_free(graph->listeners.filter_sink_ports_connected,
- TRUE);
- graph->listeners.filter_sink_ports_connected = NULL;
- }
-
bt_object_pool_finalize(&graph->event_msg_pool);
bt_object_pool_finalize(&graph->packet_begin_msg_pool);
bt_object_pool_finalize(&graph->packet_end_msg_pool);
struct bt_graph *graph;
int ret;
+ BT_ASSERT_PRE_NO_ERROR();
BT_ASSERT_PRE(mip_version <= bt_get_maximal_mip_version(),
"Unknown MIP version: mip-version=%" PRIu64 ", "
"max-mip-version=%" PRIu64,
goto error;
}
- INIT_LISTENERS_ARRAY(struct bt_graph_listener_ports_connected,
- graph->listeners.source_filter_ports_connected);
-
- if (!graph->listeners.source_filter_ports_connected) {
- goto error;
- }
-
- INIT_LISTENERS_ARRAY(struct bt_graph_listener_ports_connected,
- graph->listeners.source_sink_ports_connected);
-
- if (!graph->listeners.source_sink_ports_connected) {
- goto error;
- }
-
- INIT_LISTENERS_ARRAY(struct bt_graph_listener_ports_connected,
- graph->listeners.filter_filter_ports_connected);
-
- if (!graph->listeners.filter_filter_ports_connected) {
- goto error;
- }
-
- INIT_LISTENERS_ARRAY(struct bt_graph_listener_ports_connected,
- graph->listeners.filter_sink_ports_connected);
-
- if (!graph->listeners.filter_sink_ports_connected) {
- goto error;
- }
-
graph->interrupters = g_ptr_array_new_with_free_func(
(GDestroyNotify) bt_object_put_ref_no_null_check);
if (!graph->interrupters) {
const struct bt_connection **user_connection)
{
enum bt_graph_connect_ports_status status = BT_FUNC_STATUS_OK;
- enum bt_graph_listener_func_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;
enum bt_component_class_port_connected_method_status port_connected_status;
bool init_can_consume;
+ BT_ASSERT_PRE_NO_ERROR();
BT_ASSERT_PRE_NON_NULL(graph, "Graph");
BT_ASSERT_PRE_NON_NULL(upstream_port, "Upstream port");
BT_ASSERT_PRE_NON_NULL(downstream_port, "Downstream port port");
connection->notified_downstream_port_connected = true;
- /*
- * Notify the graph's creator that both ports are connected.
- */
- BT_LOGD_STR("Notifying graph's user that new component ports are connected.");
- listener_status = bt_graph_notify_ports_connected(graph, upstream_port, downstream_port);
- if (listener_status != BT_FUNC_STATUS_OK) {
- if (listener_status < 0) {
- BT_LIB_LOGW_APPEND_CAUSE(
- "Graph \"ports connected\" listener failed: "
- "status=%d, %![graph-]+g, %![up-comp-]+c, "
- "%![down-comp-]+c, %![up-port-]+p, %![down-port-]+p",
- listener_status, graph,
- upstream_component, downstream_component,
- upstream_port, downstream_port);
- }
-
- status = (int) listener_status;
- goto end;
- }
-
- connection->notified_graph_ports_connected = true;
BT_LIB_LOGI("Connected component ports within graph: "
"%![graph-]+g, %![up-comp-]+c, %![down-comp-]+c, "
"%![up-port-]+p, %![down-port-]+p",
if (user_connection) {
/* Move reference to user */
*user_connection = connection;
- connection = NULL;
}
end:
enum bt_component_class_sink_consume_method_status consume_status;
struct bt_component_class_sink *sink_class = NULL;
- BT_ASSERT(comp);
+ BT_ASSERT_DBG(comp);
sink_class = (void *) comp->parent.class;
- BT_ASSERT(sink_class->methods.consume);
+ BT_ASSERT_DBG(sink_class->methods.consume);
BT_LIB_LOGD("Calling user's consume method: %!+c", comp);
consume_status = sink_class->methods.consume((void *) comp);
BT_LOGD("User method returned: status=%s",
consume_status == BT_FUNC_STATUS_MEMORY_ERROR,
"Invalid component status returned by consuming method: "
"status=%s", bt_common_func_status_string(consume_status));
+ BT_ASSERT_POST_DEV_NO_ERROR_IF_NO_ERROR_STATUS(consume_status);
if (consume_status) {
if (consume_status < 0) {
BT_LIB_LOGW_APPEND_CAUSE(
int index;
BT_LIB_LOGD("Making specific sink consume: %![comp-]+c", sink);
- BT_ASSERT(bt_component_borrow_graph((void *) sink) == graph);
+ BT_ASSERT_DBG(bt_component_borrow_graph((void *) sink) == graph);
if (g_queue_is_empty(graph->sinks_to_consume)) {
BT_LOGD_STR("Graph's sink queue is empty: end of graph.");
}
sink_node = g_queue_pop_nth_link(graph->sinks_to_consume, index);
- BT_ASSERT(sink_node);
+ BT_ASSERT_DBG(sink_node);
status = consume_sink_node(graph, sink_node);
end:
{
enum bt_graph_run_once_status status;
+ BT_ASSERT_PRE_NO_ERROR();
BT_ASSERT_PRE_DEV_NON_NULL(graph, "Graph");
BT_ASSERT_PRE_DEV(graph->can_consume,
"Cannot consume graph in its current state: %!+g", graph);
{
enum bt_graph_run_status status;
+ BT_ASSERT_PRE_NO_ERROR();
BT_ASSERT_PRE_NON_NULL(graph, "Graph");
BT_ASSERT_PRE(graph->can_consume,
"Cannot consume graph in its current state: %!+g", graph);
}
} while (status == BT_FUNC_STATUS_OK);
- if (g_queue_is_empty(graph->sinks_to_consume)) {
- status = BT_FUNC_STATUS_END;
+ if (status == BT_FUNC_STATUS_END) {
+ /*
+ * The last call to consume_no_check() returned
+ * `BT_FUNC_STATUS_END`, but bt_graph_run() has no
+ * `BT_GRAPH_RUN_STATUS_END` status: replace with
+ * `BT_GRAPH_RUN_STATUS_OK` (success: graph ran
+ * completely).
+ */
+ status = BT_FUNC_STATUS_OK;
}
end:
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: "
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: "
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: "
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: "
return BT_FUNC_STATUS_OK;
}
-enum bt_graph_add_listener_status
-bt_graph_add_source_filter_component_ports_connected_listener(
- struct bt_graph *graph,
- bt_graph_source_filter_component_ports_connected_listener_func func,
- bt_graph_listener_removed_func listener_removed, void *data,
- bt_listener_id *out_listener_id)
-{
- struct bt_graph_listener_ports_connected listener = {
- .base = {
- .removed = listener_removed,
- .data = data,
- },
- .func = (ports_connected_func_t) func,
- };
- bt_listener_id listener_id;
-
- 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_filter_ports_connected,
- listener);
- listener_id = graph->listeners.source_filter_ports_connected->len - 1;
- BT_LIB_LOGD("Added \"source to filter component ports connected\" listener to graph: "
- "%![graph-]+g, listener-addr=%p, id=%d", graph, listener,
- listener_id);
-
- if (listener_id) {
- *out_listener_id = listener_id;
- }
-
- return BT_FUNC_STATUS_OK;
-}
-
-enum bt_graph_add_listener_status
-bt_graph_add_source_sink_component_ports_connected_listener(
- struct bt_graph *graph,
- bt_graph_source_sink_component_ports_connected_listener_func func,
- bt_graph_listener_removed_func listener_removed, void *data,
- bt_listener_id *out_listener_id)
-{
- struct bt_graph_listener_ports_connected listener = {
- .base = {
- .removed = listener_removed,
- .data = data,
- },
- .func = (ports_connected_func_t) func,
- };
- bt_listener_id listener_id;
-
- 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_sink_ports_connected,
- listener);
- listener_id = graph->listeners.source_sink_ports_connected->len - 1;
- BT_LIB_LOGD("Added \"source to sink component ports connected\" listener to graph: "
- "%![graph-]+g, listener-addr=%p, id=%d", graph, listener,
- listener_id);
-
- if (listener_id) {
- *out_listener_id = listener_id;
- }
-
- return BT_FUNC_STATUS_OK;
-}
-
-enum bt_graph_add_listener_status
-bt_graph_add_filter_filter_component_ports_connected_listener(
- struct bt_graph *graph,
- bt_graph_filter_filter_component_ports_connected_listener_func func,
- bt_graph_listener_removed_func listener_removed, void *data,
- bt_listener_id *out_listener_id)
-{
- struct bt_graph_listener_ports_connected listener = {
- .base = {
- .removed = listener_removed,
- .data = data,
- },
- .func = (ports_connected_func_t) func,
- };
- bt_listener_id listener_id;
-
- 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_filter_ports_connected,
- listener);
- listener_id = graph->listeners.filter_filter_ports_connected->len - 1;
- BT_LIB_LOGD("Added \"filter to filter component ports connected\" listener to graph: "
- "%![graph-]+g, listener-addr=%p, id=%d", graph, listener,
- listener_id);
-
- if (listener_id) {
- *out_listener_id = listener_id;
- }
-
- return BT_FUNC_STATUS_OK;
-}
-
-enum bt_graph_add_listener_status
-bt_graph_add_filter_sink_component_ports_connected_listener(
- struct bt_graph *graph,
- bt_graph_filter_sink_component_ports_connected_listener_func func,
- bt_graph_listener_removed_func listener_removed, void *data,
- bt_listener_id *out_listener_id)
-{
- struct bt_graph_listener_ports_connected listener = {
- .base = {
- .removed = listener_removed,
- .data = data,
- },
- .func = (ports_connected_func_t) func,
- };
- bt_listener_id listener_id;
-
- 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_sink_ports_connected,
- listener);
- listener_id = graph->listeners.filter_sink_ports_connected->len - 1;
- BT_LIB_LOGD("Added \"filter to sink component ports connected\" listener to graph: "
- "%![graph-]+g, listener-addr=%p, id=%d", graph, listener,
- listener_id);
-
- if (listener_id) {
- *out_listener_id = listener_id;
- }
-
- return BT_FUNC_STATUS_OK;
-}
-
BT_HIDDEN
enum bt_graph_listener_func_status bt_graph_notify_port_added(
struct bt_graph *graph, struct bt_port *port)
listeners = graph->listeners.source_output_port_added;
break;
default:
- abort();
+ bt_common_abort();
}
break;
listeners = graph->listeners.filter_output_port_added;
break;
default:
- abort();
+ bt_common_abort();
}
break;
listeners = graph->listeners.sink_input_port_added;
break;
default:
- abort();
+ bt_common_abort();
}
break;
}
default:
- abort();
+ bt_common_abort();
}
for (i = 0; i < listeners->len; i++) {
BT_ASSERT(listener->func);
- status = listener->func(comp, port, listener->base.data);
- if (status != BT_FUNC_STATUS_OK) {
- goto end;
- }
- }
-
-end:
- return status;
-}
-
-BT_HIDDEN
-enum bt_graph_listener_func_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_func_status status = BT_FUNC_STATUS_OK;
-
- BT_ASSERT(graph);
- BT_ASSERT(upstream_port);
- BT_ASSERT(downstream_port);
- BT_LIB_LOGD("Notifying graph listeners that ports were connected: "
- "%![graph-]+g, %![up-port-]+p, %![down-port-]+p",
- graph, upstream_port, downstream_port);
- upstream_comp = bt_port_borrow_component_inline(upstream_port);
- BT_ASSERT(upstream_comp);
- downstream_comp = bt_port_borrow_component_inline(downstream_port);
- BT_ASSERT(downstream_comp);
-
- switch (upstream_comp->class->type) {
- case BT_COMPONENT_CLASS_TYPE_SOURCE:
- {
- switch (downstream_comp->class->type) {
- case BT_COMPONENT_CLASS_TYPE_FILTER:
- listeners =
- graph->listeners.source_filter_ports_connected;
- break;
- case BT_COMPONENT_CLASS_TYPE_SINK:
- listeners =
- graph->listeners.source_sink_ports_connected;
- break;
- default:
- abort();
- }
-
- break;
- }
- case BT_COMPONENT_CLASS_TYPE_FILTER:
- {
- switch (downstream_comp->class->type) {
- case BT_COMPONENT_CLASS_TYPE_FILTER:
- listeners =
- graph->listeners.filter_filter_ports_connected;
- break;
- case BT_COMPONENT_CLASS_TYPE_SINK:
- listeners =
- graph->listeners.filter_sink_ports_connected;
- break;
- default:
- abort();
- }
-
- break;
- }
- default:
- abort();
- }
-
- for (i = 0; i < listeners->len; i++) {
- struct bt_graph_listener_ports_connected *listener =
- &g_array_index(listeners,
- struct bt_graph_listener_ports_connected, i);
-
- BT_ASSERT(listener->func);
- status = listener->func(upstream_comp, downstream_comp,
- upstream_port, downstream_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;
}
init_status = init_method(component, NULL, params, init_method_data);
BT_LOGD("User method returned: status=%s",
bt_common_func_status_string(init_status));
+ BT_ASSERT_POST_DEV_NO_ERROR_IF_NO_ERROR_STATUS(init_status);
if (init_status != BT_FUNC_STATUS_OK) {
if (init_status < 0) {
BT_LIB_LOGW_APPEND_CAUSE(
if (user_component) {
/* Move reference to user */
*user_component = component;
- component = NULL;
}
end:
void *init_method_data, bt_logging_level log_level,
const struct bt_component_source **component)
{
+ BT_ASSERT_PRE_NO_ERROR();
BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
return add_component_with_init_method_data(graph,
(void *) comp_cls, (comp_init_method_t) comp_cls->methods.init,
enum bt_logging_level log_level,
const struct bt_component_source **component)
{
+ BT_ASSERT_PRE_NO_ERROR();
return bt_graph_add_source_component_with_initialize_method_data(
graph, comp_cls, name, params, NULL, log_level, component);
}
void *init_method_data, enum bt_logging_level log_level,
const struct bt_component_filter **component)
{
+ BT_ASSERT_PRE_NO_ERROR();
BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
return add_component_with_init_method_data(graph,
(void *) comp_cls, (comp_init_method_t) comp_cls->methods.init,
enum bt_logging_level log_level,
const struct bt_component_filter **component)
{
+ BT_ASSERT_PRE_NO_ERROR();
return bt_graph_add_filter_component_with_initialize_method_data(
graph, comp_cls, name, params, NULL, log_level, component);
}
void *init_method_data, enum bt_logging_level log_level,
const struct bt_component_sink **component)
{
+ BT_ASSERT_PRE_NO_ERROR();
BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
return add_component_with_init_method_data(graph,
(void *) comp_cls, (comp_init_method_t) comp_cls->methods.init,
enum bt_logging_level log_level,
const struct bt_component_sink **component)
{
+ BT_ASSERT_PRE_NO_ERROR();
return bt_graph_add_sink_component_with_initialize_method_data(
graph, comp_cls, name, params, NULL, log_level, component);
}
.user_data = user_data,
};
+ BT_ASSERT_PRE_NO_ERROR();
+
/*
* Other preconditions are checked by
* bt_graph_add_sink_component_with_init_method_data().
return status;
}
-BT_HIDDEN
-int bt_graph_remove_unconnected_component(struct bt_graph *graph,
- struct bt_component *component)
-{
- bool init_can_consume;
- uint64_t count;
- uint64_t i;
- int ret = 0;
-
- BT_ASSERT(graph);
- BT_ASSERT(component);
- BT_ASSERT(component->base.ref_count == 0);
- BT_ASSERT(bt_component_borrow_graph(component) == graph);
-
- init_can_consume = graph->can_consume;
- count = bt_component_get_input_port_count(component);
-
- for (i = 0; i < count; i++) {
- struct bt_port *port = (void *)
- bt_component_borrow_input_port_by_index(component, i);
-
- BT_ASSERT(port);
-
- if (bt_port_is_connected(port)) {
- BT_LIB_LOGW_APPEND_CAUSE(
- "Cannot remove component from graph: "
- "an input port is connected: "
- "%![graph-]+g, %![comp-]+c, %![port-]+p",
- graph, component, port);
- goto error;
- }
- }
-
- count = bt_component_get_output_port_count(component);
-
- for (i = 0; i < count; i++) {
- struct bt_port *port = (void *)
- bt_component_borrow_output_port_by_index(component, i);
-
- BT_ASSERT(port);
-
- if (bt_port_is_connected(port)) {
- BT_LIB_LOGW_APPEND_CAUSE(
- "Cannot remove component from graph: "
- "an output port is connected: "
- "%![graph-]+g, %![comp-]+c, %![port-]+p",
- graph, component, port);
- goto error;
- }
- }
-
- bt_graph_set_can_consume(graph, false);
-
- /* Possibly remove from sinks to consume */
- (void) g_queue_remove(graph->sinks_to_consume, component);
-
- if (graph->sinks_to_consume->length == 0) {
- graph->has_sink = false;
- }
-
- /*
- * This calls bt_object_try_spec_release() on the component, and
- * since its reference count is 0, its destructor is called. Its
- * destructor calls the user's finalization method (if set).
- */
- g_ptr_array_remove(graph->components, component);
- goto end;
-
-error:
- ret = -1;
-
-end:
- (void) init_can_consume;
- bt_graph_set_can_consume(graph, init_can_consume);
- return ret;
-}
-
BT_HIDDEN
void bt_graph_add_message(struct bt_graph *graph,
struct bt_message *msg)
BT_HIDDEN
bool bt_graph_is_interrupted(const struct bt_graph *graph)
{
- BT_ASSERT(graph);
+ BT_ASSERT_DBG(graph);
return bt_interrupter_array_any_is_set(graph->interrupters);
}
enum bt_graph_add_interrupter_status bt_graph_add_interrupter(
struct bt_graph *graph, const struct bt_interrupter *intr)
{
+ BT_ASSERT_PRE_NO_ERROR();
BT_ASSERT_PRE_NON_NULL(graph, "Graph");
BT_ASSERT_PRE_NON_NULL(intr, "Interrupter");
g_ptr_array_add(graph->interrupters, (void *) intr);
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)
projects / babeltrace.git / blobdiff