X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fplugin%2Fplugin.c;h=838ceeff439a16d2cb9f8582454d8a4975b3ee11;hb=43c59509042845f8d42c3e99ec74d45fa2dc0908;hp=24b3aef9bbcc44a89bb301fec3c2bc5146c929d4;hpb=7c7301d5827bd10ec7c34da7ffc5fe74e5047d38;p=babeltrace.git

diff --git a/src/lib/plugin/plugin.c b/src/lib/plugin/plugin.c
index 24b3aef9..838ceeff 100644
--- a/src/lib/plugin/plugin.c
+++ b/src/lib/plugin/plugin.c
@@ -31,13 +31,14 @@
 #include "common/macros.h"
 #include "compat/compiler.h"
 #include "common/common.h"
-#include <babeltrace2/plugin/plugin-const.h>
-#include <babeltrace2/graph/component-class-const.h>
-#include <babeltrace2/current-thread.h>
+#include <babeltrace2/plugin/plugin-loading.h>
+#include <babeltrace2/graph/component-class.h>
+#include <babeltrace2/error-reporting.h>
 #include "lib/graph/component-class.h"
 #include <babeltrace2/types.h>
 #include <glib.h>
 #include <unistd.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <inttypes.h>
@@ -187,6 +188,8 @@ enum bt_plugin_find_all_from_static_status bt_plugin_find_all_from_static(
 		bt_bool fail_on_load_error,
 		const struct bt_plugin_set **plugin_set_out)
 {
+	BT_ASSERT_PRE_NO_ERROR();
+
 	/* bt_plugin_so_create_all_from_static() logs errors */
 	return bt_plugin_so_create_all_from_static(fail_on_load_error,
 		(void *) plugin_set_out);
@@ -198,6 +201,7 @@ enum bt_plugin_find_all_from_file_status bt_plugin_find_all_from_file(
 {
 	enum bt_plugin_find_all_from_file_status status;
 
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(path, "Path");
 	BT_ASSERT_PRE_NON_NULL(path, "Plugin set (output)");
 	BT_LOGI("Creating plugins from file: path=\"%s\"", path);
@@ -281,6 +285,7 @@ enum bt_plugin_find_all_status bt_plugin_find_all(bt_bool find_in_std_env_var,
 	int status = BT_FUNC_STATUS_OK;
 	uint64_t dir_i, plugin_i;
 
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(plugin_set_out, "Plugin set (output)");
 	BT_LOGI("Finding all plugins in standard directories and built-in plugins: "
 		"find-in-std-env-var=%d, find-in-user-dir=%d, "
@@ -464,6 +469,7 @@ enum bt_plugin_find_status bt_plugin_find(const char *plugin_name,
 	const struct bt_plugin_set *plugin_set = NULL;
 	uint64_t i;
 
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(plugin_name, "Name");
 	BT_ASSERT_PRE_NON_NULL(plugin_out, "Plugin (output)");
 	BT_LOGI("Finding named plugin in standard directories and built-in plugins: "
@@ -620,7 +626,7 @@ int bt_plugin_create_append_all_from_dir(struct bt_plugin_set *plugin_set,
 			": path=\"%s\", recurse=%d",
 			path, recurse);
 		(void) BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_UNKNOWN(
-			"Babeltrace library",
+			BT_LIB_LOG_LIBBABELTRACE2_NAME,
 			"Cannot open directory: path=\"%s\", recurse=%d",
 			path, recurse);
 		status = BT_FUNC_STATUS_ERROR;
@@ -665,6 +671,7 @@ enum bt_plugin_find_all_from_dir_status bt_plugin_find_all_from_dir(
 	enum bt_plugin_find_all_from_dir_status status =
 		BT_FUNC_STATUS_OK;
 
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(plugin_set_out, "Plugin set (output)");
 	BT_LOGI("Creating all plugins in directory: path=\"%s\", recurse=%d",
 		path, recurse);