X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fcomponent.h;h=401cc38591b27873933eeaa3ad03f82bde680bf0;hb=5a3fec55322bf221441f86d5ffedeb049d08d200;hp=c993ce6914df7a01c72f6a74d4553b43d30dea6c;hpb=d24d56638469189904fb6ddbb3c725817b3e9417;p=babeltrace.git

diff --git a/src/lib/graph/component.h b/src/lib/graph/component.h
index c993ce69..401cc385 100644
--- a/src/lib/graph/component.h
+++ b/src/lib/graph/component.h
@@ -1,38 +1,21 @@
-#ifndef BABELTRACE_GRAPH_COMPONENT_INTERNAL_H
-#define BABELTRACE_GRAPH_COMPONENT_INTERNAL_H
-
 /*
+ * SPDX-License-Identifier: MIT
+ *
  * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2015 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.
  */
 
-#include "common/macros.h"
-#include <babeltrace2/graph/component-const.h>
+#ifndef BABELTRACE_GRAPH_COMPONENT_INTERNAL_H
+#define BABELTRACE_GRAPH_COMPONENT_INTERNAL_H
+
+#include <babeltrace2/graph/component.h>
 #include <babeltrace2/graph/component-class.h>
 #include "lib/object.h"
 #include <babeltrace2/types.h>
 #include <babeltrace2/logging.h>
 #include "common/assert.h"
 #include <glib.h>
-#include <stdio.h>
+#include <stdbool.h>
 
 #include "component-class.h"
 #include "port.h"
@@ -53,12 +36,6 @@ struct bt_component {
 	GString *name;
 	bt_logging_level log_level;
 
-	/*
-	 * Internal destroy function specific to a source, filter, or
-	 * sink component object.
-	 */
-	void (*destroy)(struct bt_component *);
-
 	/* User-defined data */
 	void *user_data;
 
@@ -75,66 +52,60 @@ struct bt_component {
 static inline
 struct bt_graph *bt_component_borrow_graph(struct bt_component *comp)
 {
-	BT_ASSERT(comp);
+	BT_ASSERT_DBG(comp);
 	return (void *) bt_object_borrow_parent(&comp->base);
 }
 
-BT_HIDDEN
 int bt_component_create(struct bt_component_class *component_class,
 		const char *name, bt_logging_level log_level,
 		struct bt_component **component);
 
-BT_HIDDEN
 enum bt_component_class_port_connected_method_status
 bt_component_port_connected(
 		struct bt_component *comp,
 		struct bt_port *self_port, struct bt_port *other_port);
 
-BT_HIDDEN
 void bt_component_set_graph(struct bt_component *component,
 		struct bt_graph *graph);
 
-BT_HIDDEN
-uint64_t bt_component_get_input_port_count(const struct bt_component *comp);
+uint64_t bt_component_get_input_port_count(const struct bt_component *comp,
+		const char *api_func);
 
-BT_HIDDEN
-uint64_t bt_component_get_output_port_count(const struct bt_component *comp);
+uint64_t bt_component_get_output_port_count(const struct bt_component *comp,
+		const char *api_func);
 
-BT_HIDDEN
 struct bt_port_input *bt_component_borrow_input_port_by_index(
-		struct bt_component *comp, uint64_t index);
+		struct bt_component *comp, uint64_t index,
+		const char *api_func);
 
-BT_HIDDEN
 struct bt_port_output *bt_component_borrow_output_port_by_index(
-		struct bt_component *comp, uint64_t index);
+		struct bt_component *comp, uint64_t index,
+		const char *api_func);
 
-BT_HIDDEN
 struct bt_port_input *bt_component_borrow_input_port_by_name(
-		struct bt_component *comp, const char *name);
+		struct bt_component *comp, const char *name,
+		const char *api_func);
 
-BT_HIDDEN
 struct bt_port_output *bt_component_borrow_output_port_by_name(
-		struct bt_component *comp, const char *name);
+		struct bt_component *comp, const char *name,
+		const char *api_func);
 
-BT_HIDDEN
 enum bt_self_component_add_port_status bt_component_add_input_port(
 		struct bt_component *component, const char *name,
-		void *user_data, struct bt_port **port);
+		void *user_data, struct bt_port **port,
+		const char *api_func);
 
-BT_HIDDEN
 enum bt_self_component_add_port_status bt_component_add_output_port(
 		struct bt_component *component, const char *name,
-		void *user_data, struct bt_port **port);
+		void *user_data, struct bt_port **port,
+		const char *api_func);
 
-BT_HIDDEN
 void bt_component_remove_port(struct bt_component *component,
 		struct bt_port *port);
 
-BT_HIDDEN
 void bt_component_add_destroy_listener(struct bt_component *component,
 		bt_component_destroy_listener_func func, void *data);
 
-BT_HIDDEN
 void bt_component_remove_destroy_listener(struct bt_component *component,
 		bt_component_destroy_listener_func func, void *data);