Propagate error from packet_seek in case of truncated packet

[babeltrace.git] / converter / babeltrace.c

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index f437f4f4692ca269442cc04241d7a3a0efd4ef8a..6e6c3385f6e986fed202a297dc623ac463f28d87 100644 (file)
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -36,7 +36,7 @@
 #include <babeltrace/ctf/events-internal.h>
 #include <babeltrace/ctf/iterator.h>
 #include <babeltrace/ctf-text/types.h>
-#include <babeltrace/debuginfo.h>
+#include <babeltrace/debug-info.h>
 
 #include <babeltrace/iterator.h>
 #include <popt.h>
@@ -105,7 +105,9 @@ enum {
        OPT_CLOCK_GMT,
        OPT_CLOCK_FORCE_CORRELATE,
        OPT_STREAM_INTERSECTION,
-       OPT_DEBUG_DIR,
+       OPT_DEBUG_INFO_DIR,
+       OPT_DEBUG_INFO_FULL_PATH,
+       OPT_DEBUG_INFO_TARGET_PREFIX,
 };
 
 /*
@@ -136,8 +138,10 @@ static struct poptOption long_options[] = {
        { "clock-gmt", 0, POPT_ARG_NONE, NULL, OPT_CLOCK_GMT, NULL, NULL },
        { "clock-force-correlate", 0, POPT_ARG_NONE, NULL, OPT_CLOCK_FORCE_CORRELATE, NULL, NULL },
        { "stream-intersection", 0, POPT_ARG_NONE, NULL, OPT_STREAM_INTERSECTION, NULL, NULL },
-#ifdef ENABLE_DEBUGINFO
-       { "debug-info-dir", 0, POPT_ARG_STRING, NULL, OPT_DEBUG_DIR, NULL, NULL },
+#ifdef ENABLE_DEBUG_INFO
+       { "debug-info-dir", 0, POPT_ARG_STRING, NULL, OPT_DEBUG_INFO_DIR, NULL, NULL },
+       { "debug-info-full-path", 0, POPT_ARG_NONE, NULL, OPT_DEBUG_INFO_FULL_PATH, NULL, NULL },
+       { "debug-info-target-prefix", 0, POPT_ARG_STRING, NULL, OPT_DEBUG_INFO_TARGET_PREFIX, NULL, NULL },
 #endif
        { NULL, 0, 0, NULL, 0, NULL, NULL },
 };
@@ -185,9 +189,11 @@ static void usage(FILE *fp)
        fprintf(fp, "      --clock-force-correlate    Assume that clocks are inherently correlated\n");
        fprintf(fp, "                                 across traces.\n");
        fprintf(fp, "      --stream-intersection      Only print events when all streams are active.\n");
-#ifdef ENABLE_DEBUGINFO
+#ifdef ENABLE_DEBUG_INFO
        fprintf(fp, "      --debug-info-dir           Directory in which to look for debugging information\n");
        fprintf(fp, "                                 files. (default: /usr/lib/debug/)\n");
+       fprintf(fp, "      --debug-info-target-prefix Directory to use as a prefix for executable lookup\n");
+       fprintf(fp, "      --debug-info-full-path     Show full debug info source and binary paths (if available)\n");
 #endif
        list_formats(fp);
        fprintf(fp, "\n");
@@ -411,9 +417,19 @@ static int parse_options(int argc, char **argv)
                case OPT_STREAM_INTERSECTION:
                        opt_stream_intersection = 1;
                        break;
-               case OPT_DEBUG_DIR:
-                       opt_debug_dir = (char *) poptGetOptArg(pc);
-                       if (!opt_debug_dir) {
+               case OPT_DEBUG_INFO_DIR:
+                       opt_debug_info_dir = (char *) poptGetOptArg(pc);
+                       if (!opt_debug_info_dir) {
+                               ret = -EINVAL;
+                               goto end;
+                       }
+                       break;
+               case OPT_DEBUG_INFO_FULL_PATH:
+                       opt_debug_info_full_path = 1;
+                       break;
+               case OPT_DEBUG_INFO_TARGET_PREFIX:
+                       opt_debug_info_target_prefix = (char *) poptGetOptArg(pc);
+                       if (!opt_debug_info_target_prefix) {
                                ret = -EINVAL;
                                goto end;
                        }
@@ -647,6 +663,7 @@ int convert_trace(struct bt_trace_descriptor *td_write,
        struct bt_iter_pos *begin_pos = NULL, *end_pos = NULL;
        struct bt_ctf_event *ctf_event;
        int ret;
+       int error_holder = 0;
 
        sout = container_of(td_write, struct ctf_text_stream_pos,
                        trace_descriptor);
@@ -673,11 +690,18 @@ int convert_trace(struct bt_trace_descriptor *td_write,
                        goto end;
                }
                ret = bt_iter_next(bt_ctf_get_iter(iter));
-               if (ret < 0) {
+               if (ret == -ERANGE) {
+                       /*
+                        * Remember that a range (truncated packet)
+                        * error occurred and continue.
+                        */
+                       error_holder = 1;
+                       continue;
+               } else if (ret < 0) {
                        goto end;
                }
        }
-       ret = 0;
+       ret = error_holder;
 
 end:
        bt_ctf_iter_destroy(iter);
@@ -837,7 +861,8 @@ end:
        free(opt_input_format);
        free(opt_output_format);
        free(opt_output_path);
-       free(opt_debug_dir);
+       free(opt_debug_info_dir);
+       free(opt_debug_info_target_prefix);
        g_ptr_array_free(opt_input_paths, TRUE);
        if (partial_error)
                exit(EXIT_FAILURE);