lib: bt_plugin_find*(): return status code; add "fail on load error" param

[babeltrace.git] / src / lib / plugin / plugin.h

diff --git a/src/lib/plugin/plugin.h b/src/lib/plugin/plugin.h
index d62bfb55f0812de59d7575c7f172908ef7cf2cf1..46b2b117be7b9b089db11687f2fad155c4c88b0f 100644 (file)
--- a/src/lib/plugin/plugin.h
+++ b/src/lib/plugin/plugin.h
@@ -31,22 +31,20 @@
 #include "lib/object.h"
 #include <babeltrace2/types.h>
 #include "common/assert.h"
-#include "lib/lib-logging.h"
 #include <glib.h>
 
 #include "plugin-so.h"
 
+/* Protection: this file uses BT_LIB_LOG*() macros directly */
+#ifndef BT_LIB_LOG_SUPPORTED
+# error Please include "lib/logging.h" before including this file.
+#endif
+
 enum bt_plugin_type {
        BT_PLUGIN_TYPE_SO = 0,
        BT_PLUGIN_TYPE_PYTHON = 1,
 };
 
-enum bt_plugin_status {
-       BT_PLUGIN_STATUS_OK = 0,
-       BT_PLUGIN_STATUS_ERROR = -1,
-       BT_PLUGIN_STATUS_NOMEM = -12,
-};
-
 struct bt_plugin {
        struct bt_object base;
        enum bt_plugin_type type;
@@ -95,8 +93,12 @@ const char *bt_plugin_status_string(enum bt_plugin_status status)
        switch (status) {
        case BT_PLUGIN_STATUS_OK:
                return "BT_PLUGIN_STATUS_OK";
+       case BT_PLUGIN_STATUS_NOT_FOUND:
+               return "BT_PLUGIN_STATUS_NOT_FOUND";
        case BT_PLUGIN_STATUS_ERROR:
                return "BT_PLUGIN_STATUS_ERROR";
+       case BT_PLUGIN_STATUS_LOADING_ERROR:
+               return "BT_PLUGIN_STATUS_LOADING_ERROR";
        case BT_PLUGIN_STATUS_NOMEM:
                return "BT_PLUGIN_STATUS_NOMEM";
        default: