X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Flib%2Fplugin%2Fplugin-so.h;h=c341749bc9e38441f54ef4331f5b2054ab11354f;hp=094b87ad2d5e7c9aaf37fc1b0c36f7fd635dec1d;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d

diff --git a/src/lib/plugin/plugin-so.h b/src/lib/plugin/plugin-so.h
index 094b87ad..c341749b 100644
--- a/src/lib/plugin/plugin-so.h
+++ b/src/lib/plugin/plugin-so.h
@@ -1,32 +1,18 @@
-#ifndef BABELTRACE_PLUGIN_PLUGIN_SO_INTERNAL_H
-#define BABELTRACE_PLUGIN_PLUGIN_SO_INTERNAL_H
-
 /*
+ * SPDX-License-Identifier: MIT
+ *
  * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2016 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_PLUGIN_PLUGIN_SO_INTERNAL_H
+#define BABELTRACE_PLUGIN_PLUGIN_SO_INTERNAL_H
+
 #include <glib.h>
 #include <gmodule.h>
+#include <stdbool.h>
 #include <babeltrace2/types.h>
+#include "common/macros.h"
 
 struct bt_plugin;
 struct bt_component_class;
@@ -38,7 +24,7 @@ struct bt_plugin_so_shared_lib_handle {
 
 	/* True if initialization function was called */
 	bt_bool init_called;
-	bt_plugin_exit_func exit;
+	bt_plugin_finalize_func exit;
 };
 
 struct bt_plugin_so_spec_data {
@@ -47,16 +33,24 @@ struct bt_plugin_so_spec_data {
 
 	/* Pointers to plugin's memory: do NOT free */
 	const struct __bt_plugin_descriptor *descriptor;
-	bt_plugin_init_func init;
+	bt_plugin_initialize_func init;
 	const struct __bt_plugin_descriptor_version *version;
 };
 
 BT_HIDDEN
-struct bt_plugin_set *bt_plugin_so_create_all_from_file(const char *path);
+int bt_plugin_so_create_all_from_file(const char *path,
+		bool fail_on_load_error, struct bt_plugin_set **plugin_set_out);
 
 BT_HIDDEN
-struct bt_plugin_set *bt_plugin_so_create_all_from_static(void);
+int bt_plugin_so_create_all_from_static(bool fail_on_load_error,
+		struct bt_plugin_set **plugin_set_out);
 
+/*
+ * This function would normally be BT_HIDDEN, but it is used by the Python
+ * plugin provider, which is conceptually part of libbabeltrace2, but
+ * implemented as a separate shared object, for modularity.  It is therefore
+ * exposed, but not part of the public ABI.
+ */
 void bt_plugin_so_on_add_component_class(struct bt_plugin *plugin,
 		struct bt_component_class *comp_class);