Fix: usage of `bt_value_array_get_length()`

[babeltrace.git] / src / cli / babeltrace2-plugins.c

diff --git a/src/cli/babeltrace2-plugins.c b/src/cli/babeltrace2-plugins.c
index cc950ff21ff1ee3b87bc007a4b05b578e9dca8b3..8fdfe3e726008671bea3a81f37661750b1194699 100644 (file)
--- a/src/cli/babeltrace2-plugins.c
+++ b/src/cli/babeltrace2-plugins.c
@@ -22,11 +22,12 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "CLI"
+#define BT_LOG_TAG "CLI/PLUGINS"
 #include "logging.h"
 
 #include "babeltrace2-plugins.h"
 
+#include <stdbool.h>
 #include <babeltrace2/babeltrace.h>
 
 /* Array of bt_plugin * */
@@ -77,6 +78,11 @@ size_t get_loaded_plugins_count(void)
        return loaded_plugins->len;
 }
 
+const bt_plugin **borrow_loaded_plugins(void)
+{
+       return (const bt_plugin **) loaded_plugins->pdata;
+}
+
 const bt_plugin *borrow_loaded_plugin(size_t index)
 {
        BT_ASSERT(index < loaded_plugins->len);
@@ -123,11 +129,9 @@ int load_dynamic_plugins(const bt_value *plugin_paths)
 {
        int nr_paths, i, ret = 0;
 
-       nr_paths = bt_value_array_get_size(plugin_paths);
-       if (nr_paths < 0) {
-               BT_CLI_LOGE_APPEND_CAUSE(
-                       "Cannot load dynamic plugins: no plugin path.");
-               ret = -1;
+       nr_paths = bt_value_array_get_length(plugin_paths);
+       if (nr_paths == 0) {
+               BT_LOGI_STR("No dynamic plugin path.");
                goto end;
        }
 
@@ -156,11 +160,13 @@ int load_dynamic_plugins(const bt_value *plugin_paths)
                }
 
                status = bt_plugin_find_all_from_dir(plugin_path, BT_FALSE,
-                       BT_FALSE, &plugin_set);
+                       BT_TRUE, &plugin_set);
                if (status < 0) {
-                       BT_LOGE("Unable to load dynamic plugins from directory: "
+                       BT_CLI_LOGE_APPEND_CAUSE(
+                               "Unable to load dynamic plugins from directory: "
                                "path=\"%s\"", plugin_path);
-                       continue;
+                       ret = status;
+                       goto end;
                } else if (status ==
                                BT_PLUGIN_FIND_ALL_FROM_DIR_STATUS_NOT_FOUND) {
                        BT_LOGI("No plugins found in directory: path=\"%s\"",