lib: move plugin set API declarations to `babeltrace/plugin/plugin-set.h`

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/include/Makefile.am b/include/Makefile.am
index 9b8d925be2259ae627916d027d706dbff5d11f7e..a84dfbba480dd3357ca114948aa6529da7551f62 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -146,7 +146,8 @@ babeltracetraceirinclude_HEADERS = \
 babeltracepluginincludedir = "$(includedir)/babeltrace/plugin"
 babeltraceplugininclude_HEADERS = \
        babeltrace/plugin/plugin-dev.h \
-       babeltrace/plugin/plugin.h
+       babeltrace/plugin/plugin.h \
+       babeltrace/plugin/plugin-set.h
 
 # Graph, component, and notification API
 babeltracegraphincludedir = "$(includedir)/babeltrace/graph"

diff --git a/include/babeltrace/babeltrace.h b/include/babeltrace/babeltrace.h
index bd5a69d160fbbddfb7c7e109a2711ae473941042..e50ec20318a08c022d1a207e2acc6783d40f8b2d 100644 (file)
--- a/include/babeltrace/babeltrace.h
+++ b/include/babeltrace/babeltrace.h
@@ -90,6 +90,7 @@
 
 /* Plugin and plugin development API */
 #include <babeltrace/plugin/plugin-dev.h>
+#include <babeltrace/plugin/plugin-set.h>
 #include <babeltrace/plugin/plugin.h>
 
 /* Graph, component, and notification API */

diff --git a/include/babeltrace/plugin/plugin-set.h b/include/babeltrace/plugin/plugin-set.h
new file mode 100644 (file)
index 0000000..8ec2be1
--- /dev/null
+++ b/include/babeltrace/plugin/plugin-set.h
@@ -0,0 +1,48 @@
+#ifndef BABELTRACE_PLUGIN_PLUGIN_SET_H
+#define BABELTRACE_PLUGIN_PLUGIN_SET_H
+
+/*
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright 2017 Philippe Proulx <pproulx@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
+ * 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 <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct bt_plugin;
+struct bt_plugin_set;
+
+extern uint64_t bt_plugin_set_get_plugin_count(
+               struct bt_plugin_set *plugin_set);
+
+extern struct bt_plugin *bt_plugin_set_borrow_plugin_by_index(
+               struct bt_plugin_set *plugin_set, uint64_t index);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BABELTRACE_PLUGIN_PLUGIN_SET_H */

diff --git a/include/babeltrace/plugin/plugin.h b/include/babeltrace/plugin/plugin.h
index 667486ea01fc51230a108776d64c2b74a7390713..7aed18778a14e45725e00d6d0b93b09dc5d944d7 100644 (file)
--- a/include/babeltrace/plugin/plugin.h
+++ b/include/babeltrace/plugin/plugin.h
@@ -120,12 +120,6 @@ extern struct bt_component_class_sink *
 bt_plugin_borrow_sink_component_class_by_name(struct bt_plugin *plugin,
                const char *name);
 
-extern uint64_t bt_plugin_set_get_plugin_count(
-               struct bt_plugin_set *plugin_set);
-
-extern struct bt_plugin *bt_plugin_set_borrow_plugin_by_index(
-               struct bt_plugin_set *plugin_set, uint64_t index);
-
 #ifdef __cplusplus
 }
 #endif