flt.lttng-utils.debug-info: honor component's initial log level

[babeltrace.git] / src / plugins / lttng-utils / debug-info / bin-info.c

diff --git a/src/plugins/lttng-utils/debug-info/bin-info.c b/src/plugins/lttng-utils/debug-info/bin-info.c
index 2ecffdf8fcd324f6cac762c0c1a4eba3aef03614..20ed40a799506c70f7ed8a962279cb51a1b8d8cb 100644 (file)
--- a/src/plugins/lttng-utils/debug-info/bin-info.c
+++ b/src/plugins/lttng-utils/debug-info/bin-info.c
@@ -26,9 +26,11 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-LTTNG-UTILS-DEBUG-INFO-FLT-BIN-INFO"
-#include "logging.h"
+#define BT_LOG_OUTPUT_LEVEL (bin->log_level)
+#define BT_LOG_TAG "PLUGIN/FLT.LTTNG-UTILS.DEBUG-INFO/BIN-INFO"
+#include "logging/log.h"
 
+#include <babeltrace2/logging.h>
 #include <dwarf.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -58,12 +60,13 @@
 #define BUILD_ID_NOTE_NAME "GNU"
 
 BT_HIDDEN
-int bin_info_init(void)
+int bin_info_init(bt_logging_level log_level)
 {
        int ret = 0;
 
        if (elf_version(EV_CURRENT) == EV_NONE) {
-               BT_LOGD("ELF library initialization failed: %s.",
+               BT_LOG_WRITE_CUR_LVL(BT_LOG_INFO, log_level, BT_LOG_TAG,
+                       "ELF library initialization failed: %s.",
                        elf_errmsg(-1));
                ret = -1;
        }
@@ -74,7 +77,8 @@ int bin_info_init(void)
 BT_HIDDEN
 struct bin_info *bin_info_create(struct bt_fd_cache *fdc, const char *path,
                uint64_t low_addr, uint64_t memsz, bool is_pic,
-               const char *debug_info_dir, const char *target_prefix)
+               const char *debug_info_dir, const char *target_prefix,
+               bt_logging_level log_level)
 {
        struct bin_info *bin = NULL;
 
@@ -89,6 +93,7 @@ struct bin_info *bin_info_create(struct bt_fd_cache *fdc, const char *path,
                goto error;
        }
 
+       bin->log_level = log_level;
        if (target_prefix) {
                bin->elf_path = g_build_filename(target_prefix, path, NULL);
        } else {
@@ -163,7 +168,7 @@ int bin_info_set_elf_file(struct bin_info *bin)
 
        elf_handle = bt_fd_cache_get_handle(bin->fd_cache, bin->elf_path);
        if (!elf_handle) {
-               BT_LOGD("Failed to open %s", bin->elf_path);
+               BT_LOGI("Failed to open %s", bin->elf_path);
                goto error;
        }
        bin->elf_handle = elf_handle;
@@ -378,7 +383,7 @@ int bin_info_set_build_id(struct bin_info *bin, uint8_t *build_id,
         */
        bin->file_build_id_matches = is_build_id_matching(bin);
        if (!bin->file_build_id_matches) {
-               BT_LOGD_STR("Supplied Build ID does not match Build ID of the "
+               BT_LOGI_STR("Supplied Build ID does not match Build ID of the "
                                "binary or library found on the file system.");
                goto error;
        }
@@ -1115,7 +1120,7 @@ int bin_info_lookup_function_name(struct bin_info *bin,
        if (!bin->dwarf_info && !bin->is_elf_only) {
                ret = bin_info_set_dwarf_info(bin);
                if (ret) {
-                       BT_LOGD_STR("Failed to set bin dwarf info, falling "
+                       BT_LOGI_STR("Failed to set bin dwarf info, falling "
                                        "back to ELF lookup.");
                        /* Failed to set DWARF info, fallback to ELF. */
                        bin->is_elf_only = true;
@@ -1138,14 +1143,14 @@ int bin_info_lookup_function_name(struct bin_info *bin,
                ret = bin_info_lookup_elf_function_name(bin, addr,
                                &_func_name);
                if (ret) {
-                       BT_LOGD("Failed to lookup function name (ELF): "
+                       BT_LOGI("Failed to lookup function name (ELF): "
                                "ret=%d", ret);
                }
        } else {
                ret = bin_info_lookup_dwarf_function_name(bin, addr,
                                &_func_name);
                if (ret) {
-                       BT_LOGD("Failed to lookup function name (DWARF): "
+                       BT_LOGI("Failed to lookup function name (DWARF): "
                                "ret=%d", ret);
                }
        }