X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Fplugin%2Fplugin-const.h;h=65b66defaa429f9cf68d54c3d51cf62169099c68;hb=21a9f056fd7d86d18aa7a1700c7f47d93eb1adeb;hp=e8a8a2b640a28f6713e85fecaa1c732f422b71c2;hpb=9736d991ea189f29b908e9cf18103c1452c59e05;p=babeltrace.git

diff --git a/include/babeltrace2/plugin/plugin-const.h b/include/babeltrace2/plugin/plugin-const.h
index e8a8a2b6..65b66def 100644
--- a/include/babeltrace2/plugin/plugin-const.h
+++ b/include/babeltrace2/plugin/plugin-const.h
@@ -1,11 +1,8 @@
-#ifndef BABELTRACE_PLUGIN_PLUGIN_CONST_H
-#define BABELTRACE_PLUGIN_PLUGIN_CONST_H
+#ifndef BABELTRACE2_PLUGIN_PLUGIN_CONST_H
+#define BABELTRACE2_PLUGIN_PLUGIN_CONST_H
 
 /*
- * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (c) 2010-2019 EfficiOS Inc. and Linux Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,45 +23,75 @@
  * SOFTWARE.
  */
 
+#ifndef __BT_IN_BABELTRACE_H
+# error "Please include <babeltrace2/babeltrace.h> instead."
+#endif
+
 #include <stdint.h>
 #include <stddef.h>
 
-/*
- * For bt_bool, bt_plugin, bt_plugin_set, bt_component_class,
- * bt_component_class_source, bt_component_class_filter,
- * bt_component_class_sink
- */
 #include <babeltrace2/types.h>
-
-/* For bt_property_availability */
 #include <babeltrace2/property.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef enum bt_plugin_status {
-	BT_PLUGIN_STATUS_OK = 0,
-	BT_PLUGIN_STATUS_NOT_FOUND = 2,
-	BT_PLUGIN_STATUS_ERROR = -1,
-	BT_PLUGIN_STATUS_LOADING_ERROR = -2,
-	BT_PLUGIN_STATUS_NOMEM = -12,
-} bt_plugin_status;
+typedef enum bt_plugin_find_status {
+	BT_PLUGIN_FIND_STATUS_OK		= __BT_FUNC_STATUS_OK,
+	BT_PLUGIN_FIND_STATUS_NOT_FOUND		= __BT_FUNC_STATUS_NOT_FOUND,
+	BT_PLUGIN_FIND_STATUS_ERROR		= __BT_FUNC_STATUS_ERROR,
+	BT_PLUGIN_FIND_STATUS_MEMORY_ERROR	= __BT_FUNC_STATUS_MEMORY_ERROR,
+} bt_plugin_find_status;
 
-extern bt_plugin_status bt_plugin_find(const char *plugin_name,
+extern bt_plugin_find_status bt_plugin_find(const char *plugin_name,
+		bt_bool find_in_std_env_var, bt_bool find_in_user_dir,
+		bt_bool find_in_sys_dir, bt_bool find_in_static,
 		bt_bool fail_on_load_error, const bt_plugin **plugin);
 
-extern bt_plugin_status bt_plugin_find_all_from_file(
+typedef enum bt_plugin_find_all_status {
+	BT_PLUGIN_FIND_ALL_STATUS_OK		= __BT_FUNC_STATUS_OK,
+	BT_PLUGIN_FIND_ALL_STATUS_NOT_FOUND	= __BT_FUNC_STATUS_NOT_FOUND,
+	BT_PLUGIN_FIND_ALL_STATUS_ERROR		= __BT_FUNC_STATUS_ERROR,
+	BT_PLUGIN_FIND_ALL_STATUS_MEMORY_ERROR	= __BT_FUNC_STATUS_MEMORY_ERROR,
+} bt_plugin_find_all_status;
+
+bt_plugin_find_all_status bt_plugin_find_all(bt_bool find_in_std_env_var,
+		bt_bool find_in_user_dir, bt_bool find_in_sys_dir,
+		bt_bool find_in_static, bt_bool fail_on_load_error,
+		const bt_plugin_set **plugin_set);
+
+typedef enum bt_plugin_find_all_from_file_status {
+	BT_PLUGIN_FIND_ALL_FROM_FILE_STATUS_OK			= __BT_FUNC_STATUS_OK,
+	BT_PLUGIN_FIND_ALL_FROM_FILE_STATUS_NOT_FOUND		= __BT_FUNC_STATUS_NOT_FOUND,
+	BT_PLUGIN_FIND_ALL_FROM_FILE_STATUS_ERROR		= __BT_FUNC_STATUS_ERROR,
+	BT_PLUGIN_FIND_ALL_FROM_FILE_STATUS_MEMORY_ERROR	= __BT_FUNC_STATUS_MEMORY_ERROR,
+} bt_plugin_find_all_from_file_status;
+
+extern bt_plugin_find_all_from_file_status bt_plugin_find_all_from_file(
 		const char *path, bt_bool fail_on_load_error,
 		const bt_plugin_set **plugin_set);
 
-extern bt_plugin_status bt_plugin_find_all_from_dir(
+typedef enum bt_plugin_find_all_from_dir_status {
+	BT_PLUGIN_FIND_ALL_FROM_DIR_STATUS_OK			= __BT_FUNC_STATUS_OK,
+	BT_PLUGIN_FIND_ALL_FROM_DIR_STATUS_NOT_FOUND		= __BT_FUNC_STATUS_NOT_FOUND,
+	BT_PLUGIN_FIND_ALL_FROM_DIR_STATUS_ERROR		= __BT_FUNC_STATUS_ERROR,
+	BT_PLUGIN_FIND_ALL_FROM_DIR_STATUS_MEMORY_ERROR		= __BT_FUNC_STATUS_MEMORY_ERROR,
+} bt_plugin_find_all_from_dir_status;
+
+extern bt_plugin_find_all_from_dir_status bt_plugin_find_all_from_dir(
 		const char *path, bt_bool recurse, bt_bool fail_on_load_error,
 		const bt_plugin_set **plugin_set);
 
-extern bt_plugin_status bt_plugin_find_all_from_static(
-		bt_bool fail_on_load_error,
-		const bt_plugin_set **plugin_set);
+typedef enum bt_plugin_find_all_from_static_status {
+	BT_PLUGIN_FIND_ALL_FROM_STATIC_STATUS_OK			= __BT_FUNC_STATUS_OK,
+	BT_PLUGIN_FIND_ALL_FROM_STATIC_STATUS_NOT_FOUND			= __BT_FUNC_STATUS_NOT_FOUND,
+	BT_PLUGIN_FIND_ALL_FROM_STATIC_STATUS_ERROR			= __BT_FUNC_STATUS_ERROR,
+	BT_PLUGIN_FIND_ALL_FROM_STATIC_STATUS_MEMORY_ERROR		= __BT_FUNC_STATUS_MEMORY_ERROR,
+} bt_plugin_find_all_from_static_status;
+
+extern bt_plugin_find_all_from_static_status bt_plugin_find_all_from_static(
+		bt_bool fail_on_load_error, const bt_plugin_set **plugin_set);
 
 extern const char *bt_plugin_get_name(const bt_plugin *plugin);
 
@@ -134,4 +161,4 @@ extern void bt_plugin_put_ref(const bt_plugin *plugin);
 }
 #endif
 
-#endif /* BABELTRACE_PLUGIN_PLUGIN_CONST_H */
+#endif /* BABELTRACE2_PLUGIN_PLUGIN_CONST_H */