-#ifndef BABELTRACE_GRAPH_GRAPH_INTERNAL_H
-#define BABELTRACE_GRAPH_GRAPH_INTERNAL_H
-
/*
+ * SPDX-License-Identifier: MIT
+ *
* Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
* Copyright 2017 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
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
*/
+#ifndef BABELTRACE_GRAPH_GRAPH_INTERNAL_H
+#define BABELTRACE_GRAPH_GRAPH_INTERNAL_H
+
/* Protection: this file uses BT_LIB_LOG*() macros directly */
#ifndef BT_LIB_LOG_SUPPORTED
# error Please include "lib/logging.h" before including this file.
#endif
#include <babeltrace2/graph/graph.h>
-#include <babeltrace2/graph/message-const.h>
+#include <babeltrace2/graph/message.h>
#include "common/macros.h"
#include "lib/object.h"
#include "lib/object-pool.h"
#include "common/assert.h"
#include "common/common.h"
+#include <stdbool.h>
#include <stdlib.h>
#include <glib.h>
# error Please include "lib/logging.h" before including this file.
#endif
-/* Protection: this file uses BT_ASSERT_PRE*() macros directly */
-#ifndef BT_ASSERT_PRE_SUPPORTED
-# error Please include "lib/assert-pre.h" before including this file.
-#endif
-
-/* Protection: this file uses BT_ASSERT_POST*() macros directly */
-#ifndef BT_ASSERT_POST_SUPPORTED
-# error Please include "lib/assert-post.h" before including this file.
+/*
+ * Protection: this file uses precondition and postcondition assertion
+ * macros directly.
+ */
+#ifndef BT_ASSERT_COND_SUPPORTED
+# error Please include "lib/assert-cond.h" before including this file.
#endif
struct bt_component;
GPtrArray *interrupters;
/*
- * Default interrupter to support bt_graph_interrupt(); owned
- * by this.
+ * Default interrupter, owned by this.
*/
struct bt_interrupter *default_interrupter;
- bool in_remove_listener;
bool has_sink;
/*
GArray *filter_output_port_added;
GArray *filter_input_port_added;
GArray *sink_input_port_added;
- GArray *source_filter_ports_connected;
- GArray *source_sink_ports_connected;
- GArray *filter_filter_ports_connected;
- GArray *filter_sink_ports_connected;
} listeners;
/* Pool of `struct bt_message_event *` */
enum bt_graph_listener_func_status bt_graph_notify_port_added(struct bt_graph *graph,
struct bt_port *port);
-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);
-
BT_HIDDEN
void bt_graph_remove_connection(struct bt_graph *graph,
struct bt_connection *connection);
-/*
- * This only works with a component which is not connected at this
- * point.
- *
- * Also the reference count of `component` should be 0 when you call
- * this function, which means only `graph` owns the component, so it
- * is safe to destroy.
- */
-BT_HIDDEN
-int bt_graph_remove_unconnected_component(struct bt_graph *graph,
- struct bt_component *component);
-
BT_HIDDEN
void bt_graph_add_message(struct bt_graph *graph,
struct bt_message *msg);
comp_status == BT_FUNC_STATUS_MEMORY_ERROR,
"Unexpected returned status: status=%s",
bt_common_func_status_string(comp_status));
+ BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS(comp_status);
if (comp_status != BT_FUNC_STATUS_OK) {
if (comp_status < 0) {
BT_LIB_LOGW_APPEND_CAUSE(