src.ctf.fs fix: wrong type specifier used in logging statement

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

diff --git a/plugins/lttng-utils/debug-info.c b/plugins/lttng-utils/debug-info.c
index bc8fa6ddd7273c2639ced371879be0f09100f0cb..92833cae0ffec4e04004a0f2a77f7f36dd6296eb 100644 (file)
--- a/plugins/lttng-utils/debug-info.c
+++ b/plugins/lttng-utils/debug-info.c
@@ -25,6 +25,9 @@
  * SOFTWARE.
  */
 
+#define BT_LOG_TAG "PLUGIN-CTF-LTTNG-UTILS-DEBUG-INFO-FLT"
+#include "logging.h"
+
 #include <assert.h>
 #include <glib.h>
 #include "debug-info.h"
@@ -119,7 +122,7 @@ struct debug_info_source *debug_info_source_create_from_bin(struct bin_info *bin
        if (!bin->is_elf_only || !debug_info_src->func) {
                /* Lookup source location */
                ret = bin_info_lookup_source_location(bin, ip, &src_loc);
-               printf_verbose("Failed to lookup source location (err: %i)\n", ret);
+               BT_LOGD("Failed to lookup source location: ret=%d", ret);
        }
 
        if (src_loc) {
@@ -381,18 +384,13 @@ void handle_statedump_build_id_event(FILE *err, struct debug_info *debug_info,
        ret = get_stream_event_context_int_field_value(err,
                        event, "_vpid", &vpid);
        if (ret) {
-               fprintf(err, "[error] %s in %s:%d\n", __func__,
-                               __FILE__, __LINE__);
-               ret = -1;
                goto end;
        }
 
        ret = get_payload_unsigned_int_field_value(err,
                        event, "_baddr", &baddr);
        if (ret) {
-               fprintf(err, "[error] %s in %s:%d\n", __func__,
-                               __FILE__, __LINE__);
-               ret = -1;
+               BT_LOGE_STR("Failed to get unsigned int value for _vpid field.");
                goto end;
        }
 
@@ -415,9 +413,7 @@ void handle_statedump_build_id_event(FILE *err, struct debug_info *debug_info,
        ret = get_payload_build_id_field_value(err, event, "_build_id",
                        &bin->build_id, &bin->build_id_len);
        if (ret) {
-               fprintf(err, "[error] %s in %s:%d\n", __func__,
-                               __FILE__, __LINE__);
-               ret = -1;
+               BT_LOGE_STR("Failed to get _build_id field value.");
                goto end;
        }
 
@@ -451,25 +447,20 @@ void handle_statedump_debug_link_event(FILE *err, struct debug_info *debug_info,
        ret = get_stream_event_context_int_field_value(err, event,
                        "_vpid", &vpid);
        if (ret) {
-               fprintf(err, "[error] %s in %s:%d\n", __func__,
-                               __FILE__, __LINE__);
-               ret = -1;
                goto end;
        }
 
        ret = get_payload_unsigned_int_field_value(err,
                        event, "_baddr", &baddr);
        if (ret) {
-               fprintf(err, "[error] %s in %s:%d\n", __func__,
-                               __FILE__, __LINE__);
+               BT_LOGE_STR("Failed to get unsigned int value for _baddr field.");
                ret = -1;
                goto end;
        }
 
        ret = get_payload_unsigned_int_field_value(err, event, "_crc32", &tmp);
        if (ret) {
-               fprintf(err, "[error] %s in %s:%d\n", __func__,
-                               __FILE__, __LINE__);
+               BT_LOGE_STR("Failed to get unsigned int value for _crc32 field.");
                ret = -1;
                goto end;
        }
@@ -478,8 +469,7 @@ void handle_statedump_debug_link_event(FILE *err, struct debug_info *debug_info,
        ret = get_payload_string_field_value(err,
                        event, "_filename", &filename);
        if (ret) {
-               fprintf(err, "[error] %s in %s:%d\n", __func__,
-                               __FILE__, __LINE__);
+               BT_LOGE_STR("Failed to get string value for _filename field.");
                ret = -1;
                goto end;
        }
@@ -522,27 +512,24 @@ void handle_bin_info_event(FILE *err, struct debug_info *debug_info,
        ret = get_payload_unsigned_int_field_value(err,
                        event, "_baddr", &baddr);
        if (ret) {
-               fprintf(err, "[error] %s in %s:%d\n", __func__,
-                               __FILE__, __LINE__);
-               ret = -1;
+               BT_LOGE_STR("Failed to get unsigned int value for _baddr field.");
                goto end;
        }
 
        ret = get_payload_unsigned_int_field_value(err,
                        event, "_memsz", &memsz);
        if (ret) {
-               fprintf(err, "[error] %s in %s:%d\n", __func__,
-                               __FILE__, __LINE__);
-               ret = -1;
+               BT_LOGE_STR("Failed to get unsigned int value for _memsz field.");
                goto end;
        }
 
+       /*
+        * This field is not produced by the dlopen event emitted before
+        * lttng-ust 2.9.
+        */
        ret = get_payload_string_field_value(err,
                        event, "_path", &path);
-       if (ret) {
-               fprintf(err, "[error] %s in %s:%d\n", __func__,
-                               __FILE__, __LINE__);
-               ret = -1;
+       if (ret || !path) {
                goto end;
        }
 
@@ -552,8 +539,7 @@ void handle_bin_info_event(FILE *err, struct debug_info *debug_info,
                ret = get_payload_unsigned_int_field_value(err,
                                event, "_is_pic", &tmp);
                if (ret) {
-                       fprintf(err, "[error] %s in %s:%d\n", __func__,
-                                       __FILE__, __LINE__);
+               BT_LOGE_STR("Failed to get unsigned int value for _is_pic field.");
                        ret = -1;
                        goto end;
                }
@@ -569,13 +555,6 @@ void handle_bin_info_event(FILE *err, struct debug_info *debug_info,
        ret = get_stream_event_context_int_field_value(err, event, "_vpid",
                        &vpid);
        if (ret) {
-               fprintf(err, "[error] %s in %s:%d\n", __func__,
-                               __FILE__, __LINE__);
-               ret = -1;
-               goto end;
-       }
-
-       if (!path) {
                goto end;
        }
 
@@ -647,8 +626,7 @@ void handle_lib_unload_event(FILE *err, struct debug_info *debug_info,
        ret = get_payload_unsigned_int_field_value(err,
                        event, "_baddr", &baddr);
        if (ret) {
-               fprintf(err, "[error] %s in %s:%d\n", __func__,
-                               __FILE__, __LINE__);
+               BT_LOGE_STR("Failed to get unsigned int value for _baddr field.");
                ret = -1;
                goto end;
        }
@@ -656,9 +634,6 @@ void handle_lib_unload_event(FILE *err, struct debug_info *debug_info,
        ret = get_stream_event_context_int_field_value(err, event, "_vpid",
                        &vpid);
        if (ret) {
-               fprintf(err, "[error] %s in %s:%d\n", __func__,
-                               __FILE__, __LINE__);
-               ret = -1;
                goto end;
        }
 
@@ -686,9 +661,6 @@ void handle_statedump_start(FILE *err, struct debug_info *debug_info,
        ret = get_stream_event_context_int_field_value(err, event,
                        "_vpid", &vpid);
        if (ret) {
-               fprintf(err, "[error] %s in %s:%d\n", __func__,
-                               __FILE__, __LINE__);
-               ret = -1;
                goto end;
        }