/*
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
* Copyright 2017 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- * Copyright 2017 Philippe Proulx <pproulx@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
#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/private-graph.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.h>
-#include <babeltrace/graph/component-filter.h>
-#include <babeltrace/graph/port.h>
+#include <babeltrace/graph/component-source-const.h>
+#include <babeltrace/graph/component-filter-const.h>
+#include <babeltrace/graph/port-const.h>
#include <babeltrace/graph/notification-internal.h>
#include <babeltrace/graph/notification-event-internal.h>
#include <babeltrace/graph/notification-packet-internal.h>
#include <babeltrace/compiler-internal.h>
#include <babeltrace/common-internal.h>
#include <babeltrace/types.h>
-#include <babeltrace/values.h>
-#include <babeltrace/values-const.h>
-#include <babeltrace/values-internal.h>
-#include <babeltrace/object.h>
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/assert-pre-internal.h>
+#include <babeltrace/value.h>
+#include <babeltrace/value-const.h>
+#include <babeltrace/value-internal.h>
#include <unistd.h>
#include <glib.h>
-typedef void (*port_added_func_t)(void *, void *, void *);
-typedef void (*port_removed_func_t)(void *, void *, void *);
-typedef void (*ports_connected_func_t)(void *, void *, void *, void *, void *);
-typedef void (*ports_disconnected_func_t)(void *, void *, void *, void *, void *);
-typedef enum bt_self_component_status (*comp_init_method_t)(void *, const void *, void *);
+typedef void (*port_added_func_t)(const void *, const void *, void *);
+
+typedef void (*port_removed_func_t)(const void *, const void *, void *);
+
+typedef void (*ports_connected_func_t)(const void *, const void *, const void *,
+ const void *, void *);
+
+typedef void (*ports_disconnected_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 *);
struct bt_graph_listener {
- bt_private_graph_listener_removed removed;
+ bt_graph_listener_removed_func removed;
void *data;
};
static
void destroy_graph(struct bt_object *obj)
{
- struct bt_graph *graph = container_of(obj,
- struct bt_graph, base);
+ struct bt_graph *graph = container_of(obj, struct bt_graph, base);
/*
* The graph's reference count is 0 if we're here. Increment
* Cancel the graph to disallow some operations, like creating
* notification iterators and adding ports to components.
*/
- (void) bt_private_graph_cancel((void *) graph);
+ (void) bt_graph_cancel((void *) graph);
/* Call all remove listeners */
CALL_REMOVE_LISTENERS(struct bt_graph_listener_port_added,
void destroy_notification_packet_begin(struct bt_notification *notif,
struct bt_graph *graph)
{
- bt_notification_packet_begin_destroy(notif);
+ bt_notification_packet_beginning_destroy(notif);
}
static
bt_notification_unlink_graph(notif);
}
-struct bt_private_graph *bt_private_graph_create(void)
+struct bt_graph *bt_graph_create(void)
{
struct bt_graph *graph;
int ret;
}
ret = bt_object_pool_initialize(&graph->packet_begin_notif_pool,
- (bt_object_pool_new_object_func) bt_notification_packet_begin_new,
+ (bt_object_pool_new_object_func) bt_notification_packet_beginning_new,
(bt_object_pool_destroy_object_func) destroy_notification_packet_begin,
graph);
if (ret) {
goto end;
}
-enum bt_graph_status bt_private_graph_connect_ports(
- struct bt_private_graph *priv_graph,
- struct bt_port_output *upstream_port_out,
- struct bt_port_input *downstream_port_in,
- struct bt_connection **user_connection)
+enum bt_graph_status bt_graph_connect_ports(
+ struct bt_graph *graph,
+ const struct bt_port_output *upstream_port_out,
+ const struct bt_port_input *downstream_port_in,
+ const struct bt_connection **user_connection)
{
- struct bt_graph *graph = (void *) priv_graph;
enum bt_graph_status status = BT_GRAPH_STATUS_OK;
struct bt_connection *connection = NULL;
struct bt_port *upstream_port = (void *) upstream_port_out;
"Upstream port is already connected: %!+p", upstream_port);
BT_ASSERT_PRE(!bt_port_is_connected(downstream_port),
"Downstream port is already connected: %!+p", downstream_port);
- BT_ASSERT_PRE(bt_port_borrow_component((void *) upstream_port),
+ BT_ASSERT_PRE(bt_port_borrow_component_inline((void *) upstream_port),
"Upstream port does not belong to a component: %!+p",
upstream_port);
- BT_ASSERT_PRE(bt_port_borrow_component((void *) downstream_port),
+ BT_ASSERT_PRE(bt_port_borrow_component_inline((void *) downstream_port),
"Downstream port does not belong to a component: %!+p",
downstream_port);
init_can_consume = graph->can_consume;
"%![graph-]+g, %![up-port-]+p, %![down-port-]+p",
graph, upstream_port, downstream_port);
bt_graph_set_can_consume(graph, false);
- upstream_component = bt_port_borrow_component(
+ upstream_component = bt_port_borrow_component_inline(
(void *) upstream_port);
- downstream_component = bt_port_borrow_component(
+ downstream_component = bt_port_borrow_component_inline(
(void *) downstream_port);
/*
return status;
}
-enum bt_graph_status bt_private_graph_consume(
- struct bt_private_graph *priv_graph)
+enum bt_graph_status bt_graph_consume(
+ struct bt_graph *graph)
{
- struct bt_graph *graph = (void *) priv_graph;
enum bt_graph_status status;
BT_ASSERT_PRE_NON_NULL(graph, "Graph");
return status;
}
-enum bt_graph_status bt_private_graph_run(struct bt_private_graph *priv_graph)
+enum bt_graph_status bt_graph_run(struct bt_graph *graph)
{
- struct bt_graph *graph = (void *) priv_graph;
enum bt_graph_status status = BT_GRAPH_STATUS_OK;
BT_ASSERT_PRE_NON_NULL(graph, "Graph");
*
* However, in the case where a single sink is
* left, the caller can decide to busy-wait and
- * call bt_private_graph_run() continuously
+ * call bt_graph_run() continuously
* until the source is ready or it can decide to
* sleep for an arbitrary amount of time.
*/
}
enum bt_graph_status
-bt_private_graph_add_source_component_output_port_added_listener(
- struct bt_private_graph *priv_graph,
- bt_private_graph_source_component_output_port_added_listener func,
- bt_private_graph_listener_removed listener_removed, void *data,
+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,
int *out_listener_id)
{
- struct bt_graph *graph = (void *) priv_graph;
struct bt_graph_listener_port_added listener = {
.base = {
.removed = listener_removed,
}
enum bt_graph_status
-bt_private_graph_add_filter_component_output_port_added_listener(
- struct bt_private_graph *priv_graph,
- bt_private_graph_filter_component_output_port_added_listener func,
- bt_private_graph_listener_removed listener_removed, void *data,
+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,
int *out_listener_id)
{
- struct bt_graph *graph = (void *) priv_graph;
struct bt_graph_listener_port_added listener = {
.base = {
.removed = listener_removed,
}
enum bt_graph_status
-bt_private_graph_add_filter_component_input_port_added_listener(
- struct bt_private_graph *priv_graph,
- bt_private_graph_filter_component_input_port_added_listener func,
- bt_private_graph_listener_removed listener_removed, void *data,
+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,
int *out_listener_id)
{
- struct bt_graph *graph = (void *) priv_graph;
struct bt_graph_listener_port_added listener = {
.base = {
.removed = listener_removed,
}
enum bt_graph_status
-bt_private_graph_add_sink_component_input_port_added_listener(
- struct bt_private_graph *priv_graph,
- bt_private_graph_sink_component_input_port_added_listener func,
- bt_private_graph_listener_removed listener_removed, void *data,
+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,
int *out_listener_id)
{
- struct bt_graph *graph = (void *) priv_graph;
struct bt_graph_listener_port_added listener = {
.base = {
.removed = listener_removed,
}
enum bt_graph_status
-bt_private_graph_add_source_component_output_port_removed_listener(
- struct bt_private_graph *priv_graph,
- bt_private_graph_source_component_output_port_removed_listener func,
- bt_private_graph_listener_removed listener_removed, void *data,
+bt_graph_add_source_component_output_port_removed_listener(
+ struct bt_graph *graph,
+ bt_graph_source_component_output_port_removed_listener_func func,
+ bt_graph_listener_removed_func listener_removed, void *data,
int *out_listener_id)
{
- struct bt_graph *graph = (void *) priv_graph;
struct bt_graph_listener_port_removed listener = {
.base = {
.removed = listener_removed,
}
enum bt_graph_status
-bt_private_graph_add_filter_component_output_port_removed_listener(
- struct bt_private_graph *priv_graph,
- bt_private_graph_filter_component_output_port_removed_listener func,
- bt_private_graph_listener_removed listener_removed, void *data,
+bt_graph_add_filter_component_output_port_removed_listener(
+ struct bt_graph *graph,
+ bt_graph_filter_component_output_port_removed_listener_func func,
+ bt_graph_listener_removed_func listener_removed, void *data,
int *out_listener_id)
{
- struct bt_graph *graph = (void *) priv_graph;
struct bt_graph_listener_port_removed listener = {
.base = {
.removed = listener_removed,
}
enum bt_graph_status
-bt_private_graph_add_filter_component_input_port_removed_listener(
- struct bt_private_graph *priv_graph,
- bt_private_graph_filter_component_input_port_removed_listener func,
- bt_private_graph_listener_removed listener_removed, void *data,
+bt_graph_add_filter_component_input_port_removed_listener(
+ struct bt_graph *graph,
+ bt_graph_filter_component_input_port_removed_listener_func func,
+ bt_graph_listener_removed_func listener_removed, void *data,
int *out_listener_id)
{
- struct bt_graph *graph = (void *) priv_graph;
struct bt_graph_listener_port_removed listener = {
.base = {
.removed = listener_removed,
}
enum bt_graph_status
-bt_private_graph_add_sink_component_input_port_removed_listener(
- struct bt_private_graph *priv_graph,
- bt_private_graph_sink_component_input_port_removed_listener func,
- bt_private_graph_listener_removed listener_removed, void *data,
+bt_graph_add_sink_component_input_port_removed_listener(
+ struct bt_graph *graph,
+ bt_graph_sink_component_input_port_removed_listener_func func,
+ bt_graph_listener_removed_func listener_removed, void *data,
int *out_listener_id)
{
- struct bt_graph *graph = (void *) priv_graph;
struct bt_graph_listener_port_removed listener = {
.base = {
.removed = listener_removed,
}
enum bt_graph_status
-bt_private_graph_add_source_filter_component_ports_connected_listener(
- struct bt_private_graph *priv_graph,
- bt_private_graph_source_filter_component_ports_connected_listener func,
- bt_private_graph_listener_removed listener_removed, void *data,
+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,
int *out_listener_id)
{
- struct bt_graph *graph = (void *) priv_graph;
struct bt_graph_listener_ports_connected listener = {
.base = {
.removed = listener_removed,
}
enum bt_graph_status
-bt_private_graph_add_source_sink_component_ports_connected_listener(
- struct bt_private_graph *priv_graph,
- bt_private_graph_source_sink_component_ports_connected_listener func,
- bt_private_graph_listener_removed listener_removed, void *data,
+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,
int *out_listener_id)
{
- struct bt_graph *graph = (void *) priv_graph;
struct bt_graph_listener_ports_connected listener = {
.base = {
.removed = listener_removed,
}
enum bt_graph_status
-bt_private_graph_add_filter_sink_component_ports_connected_listener(
- struct bt_private_graph *priv_graph,
- bt_private_graph_filter_sink_component_ports_connected_listener func,
- bt_private_graph_listener_removed listener_removed, void *data,
+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,
int *out_listener_id)
{
- struct bt_graph *graph = (void *) priv_graph;
struct bt_graph_listener_ports_connected listener = {
.base = {
.removed = listener_removed,
}
enum bt_graph_status
-bt_private_graph_add_source_filter_component_ports_disconnected_listener(
- struct bt_private_graph *priv_graph,
- bt_private_graph_source_filter_component_ports_disconnected_listener func,
- bt_private_graph_listener_removed listener_removed, void *data,
+bt_graph_add_source_filter_component_ports_disconnected_listener(
+ struct bt_graph *graph,
+ bt_graph_source_filter_component_ports_disconnected_listener_func func,
+ bt_graph_listener_removed_func listener_removed, void *data,
int *out_listener_id)
{
- struct bt_graph *graph = (void *) priv_graph;
struct bt_graph_listener_ports_disconnected listener = {
.base = {
.removed = listener_removed,
}
enum bt_graph_status
-bt_private_graph_add_source_sink_component_ports_disconnected_listener(
- struct bt_private_graph *priv_graph,
- bt_private_graph_source_sink_component_ports_disconnected_listener func,
- bt_private_graph_listener_removed listener_removed, void *data,
+bt_graph_add_source_sink_component_ports_disconnected_listener(
+ struct bt_graph *graph,
+ bt_graph_source_sink_component_ports_disconnected_listener_func func,
+ bt_graph_listener_removed_func listener_removed, void *data,
int *out_listener_id)
{
- struct bt_graph *graph = (void *) priv_graph;
struct bt_graph_listener_ports_disconnected listener = {
.base = {
.removed = listener_removed,
}
enum bt_graph_status
-bt_private_graph_add_filter_sink_component_ports_disconnected_listener(
- struct bt_private_graph *priv_graph,
- bt_private_graph_filter_sink_component_ports_disconnected_listener func,
- bt_private_graph_listener_removed listener_removed, void *data,
+bt_graph_add_filter_sink_component_ports_disconnected_listener(
+ struct bt_graph *graph,
+ bt_graph_filter_sink_component_ports_disconnected_listener_func func,
+ bt_graph_listener_removed_func listener_removed, void *data,
int *out_listener_id)
{
- struct bt_graph *graph = (void *) priv_graph;
struct bt_graph_listener_ports_disconnected listener = {
.base = {
.removed = listener_removed,
BT_ASSERT(port);
BT_LIB_LOGV("Notifying graph listeners that a port was added: "
"%![graph-]+g, %![port-]+p", graph, port);
- comp = bt_port_borrow_component(port);
+ comp = bt_port_borrow_component_inline(port);
BT_ASSERT(comp);
switch (comp->class->type) {
BT_LIB_LOGV("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(upstream_port);
+ upstream_comp = bt_port_borrow_component_inline(upstream_port);
BT_ASSERT(upstream_comp);
- downstream_comp = bt_port_borrow_component(downstream_port);
+ downstream_comp = bt_port_borrow_component_inline(downstream_port);
BT_ASSERT(downstream_comp);
switch (upstream_comp->class->type) {
}
}
-enum bt_graph_status bt_private_graph_cancel(
- struct bt_private_graph *priv_graph)
+enum bt_graph_status bt_graph_cancel(
+ struct bt_graph *graph)
{
- struct bt_graph *graph = (void *) priv_graph;
BT_ASSERT_PRE_NON_NULL(graph, "Graph");
graph->canceled = true;
return BT_GRAPH_STATUS_OK;
}
-bt_bool bt_graph_is_canceled(struct bt_graph *graph)
+bt_bool bt_graph_is_canceled(const struct bt_graph *graph)
{
BT_ASSERT_PRE_NON_NULL(graph, "Graph");
return graph->canceled ? BT_TRUE : BT_FALSE;
static
enum bt_graph_status add_component_with_init_method_data(
- struct bt_private_graph *priv_graph,
+ struct bt_graph *graph,
struct bt_component_class *comp_cls,
comp_init_method_t init_method,
const char *name, const struct bt_value *params,
void *init_method_data, struct bt_component **user_component)
{
- struct bt_graph *graph = (void *) priv_graph;
enum bt_graph_status graph_status = BT_GRAPH_STATUS_OK;
enum bt_self_component_status comp_status;
struct bt_component *component = NULL;
}
enum bt_graph_status
-bt_private_graph_add_source_component_with_init_method_data(
- struct bt_private_graph *graph,
- struct bt_component_class_source *comp_cls,
+bt_graph_add_source_component_with_init_method_data(
+ struct bt_graph *graph,
+ const struct bt_component_class_source *comp_cls,
const char *name, const struct bt_value *params,
- void *init_method_data, struct bt_component_source **component)
+ void *init_method_data,
+ const struct bt_component_source **component)
{
BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
return add_component_with_init_method_data(graph,
name, params, init_method_data, (void *) component);
}
-enum bt_graph_status bt_private_graph_add_source_component(
- struct bt_private_graph *graph,
- struct bt_component_class_source *comp_cls,
+enum bt_graph_status bt_graph_add_source_component(
+ struct bt_graph *graph,
+ const struct bt_component_class_source *comp_cls,
const char *name, const struct bt_value *params,
- struct bt_component_source **component)
+ const struct bt_component_source **component)
{
- return bt_private_graph_add_source_component_with_init_method_data(
+ return bt_graph_add_source_component_with_init_method_data(
graph, comp_cls, name, params, NULL, component);
}
enum bt_graph_status
-bt_private_graph_add_filter_component_with_init_method_data(
- struct bt_private_graph *graph,
- struct bt_component_class_filter *comp_cls,
+bt_graph_add_filter_component_with_init_method_data(
+ struct bt_graph *graph,
+ const struct bt_component_class_filter *comp_cls,
const char *name, const struct bt_value *params,
- void *init_method_data, struct bt_component_filter **component)
+ void *init_method_data,
+ const struct bt_component_filter **component)
{
BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
return add_component_with_init_method_data(graph,
name, params, init_method_data, (void *) component);
}
-enum bt_graph_status bt_private_graph_add_filter_component(
- struct bt_private_graph *graph,
- struct bt_component_class_filter *comp_cls,
+enum bt_graph_status bt_graph_add_filter_component(
+ struct bt_graph *graph,
+ const struct bt_component_class_filter *comp_cls,
const char *name, const struct bt_value *params,
- struct bt_component_filter **component)
+ const struct bt_component_filter **component)
{
- return bt_private_graph_add_filter_component_with_init_method_data(
+ return bt_graph_add_filter_component_with_init_method_data(
graph, comp_cls, name, params, NULL, component);
}
enum bt_graph_status
-bt_private_graph_add_sink_component_with_init_method_data(
- struct bt_private_graph *graph,
- struct bt_component_class_sink *comp_cls,
+bt_graph_add_sink_component_with_init_method_data(
+ struct bt_graph *graph,
+ const struct bt_component_class_sink *comp_cls,
const char *name, const struct bt_value *params,
- void *init_method_data, struct bt_component_sink **component)
+ void *init_method_data,
+ const struct bt_component_sink **component)
{
BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
return add_component_with_init_method_data(graph,
name, params, init_method_data, (void *) component);
}
-enum bt_graph_status bt_private_graph_add_sink_component(
- struct bt_private_graph *graph,
- struct bt_component_class_sink *comp_cls,
+enum bt_graph_status bt_graph_add_sink_component(
+ struct bt_graph *graph,
+ const struct bt_component_class_sink *comp_cls,
const char *name, const struct bt_value *params,
- struct bt_component_sink **component)
+ const struct bt_component_sink **component)
{
- return bt_private_graph_add_sink_component_with_init_method_data(
+ return bt_graph_add_sink_component_with_init_method_data(
graph, comp_cls, name, params, NULL, component);
}
*/
g_ptr_array_add(graph->notifications, notif);
}
+
+void bt_graph_get_ref(const struct bt_graph *graph)
+{
+ bt_object_get_ref(graph);
+}
+
+void bt_graph_put_ref(const struct bt_graph *graph)
+{
+ bt_object_put_ref(graph);
+}
projects / babeltrace.git / blobdiff