X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=converter%2Fbabeltrace.c;h=e5aaab6bddece0ba8b4ee62e093beeecfd961a0e;hb=b5a8598f01c8e40163449bff173909eff824647b;hp=8921d5ab59d660d7913fa7078db4362db503fbe8;hpb=887d00c37959fab79628f4a63935156b549b0a82;p=babeltrace.git

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 8921d5ab..e5aaab6b 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -36,6 +36,8 @@
 #include <babeltrace/ctf/events-internal.h>
 #include <babeltrace/ctf/iterator.h>
 #include <babeltrace/ctf-text/types.h>
+#include <babeltrace/debuginfo.h>
+
 #include <babeltrace/iterator.h>
 #include <popt.h>
 #include <errno.h>
@@ -70,7 +72,7 @@ static char *opt_input_format, *opt_output_format;
  */
 static GPtrArray *opt_input_paths;
 static char *opt_output_path;
-int opt_stream_intersection;
+static int opt_stream_intersection;
 
 static struct bt_format *fmt_read;
 
@@ -103,6 +105,7 @@ enum {
 	OPT_CLOCK_GMT,
 	OPT_CLOCK_FORCE_CORRELATE,
 	OPT_STREAM_INTERSECTION,
+	OPT_DEBUG_DIR,
 };
 
 /*
@@ -133,6 +136,9 @@ 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 },
+#endif
 	{ NULL, 0, 0, NULL, 0, NULL, NULL },
 };
 
@@ -179,6 +185,10 @@ 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
+	fprintf(fp, "      --debug-info-dir           Directory in which to look for debugging information\n");
+	fprintf(fp, "                                 files. (default: /usr/lib/debug/)\n");
+#endif
 	list_formats(fp);
 	fprintf(fp, "\n");
 }
@@ -401,7 +411,13 @@ 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) {
+				ret = -EINVAL;
+				goto end;
+			}
+			break;
 		default:
 			ret = -EINVAL;
 			goto end;
@@ -624,8 +640,8 @@ end:
 
 static
 struct bt_ctf_iter *iter_create_intersect(struct bt_context *ctx,
-		struct bt_iter_pos *inter_begin_pos,
-		struct bt_iter_pos *inter_end_pos)
+		struct bt_iter_pos **inter_begin_pos,
+		struct bt_iter_pos **inter_end_pos)
 {
 	uint64_t begin = 0, end = ULLONG_MAX;
 	int ret;
@@ -638,17 +654,22 @@ struct bt_ctf_iter *iter_create_intersect(struct bt_context *ctx,
 	} else if (ret != 0) {
 		goto error;
 	}
-	inter_begin_pos = bt_iter_create_time_pos(NULL, begin);
-	if (!inter_begin_pos) {
+	*inter_begin_pos = bt_iter_create_time_pos(NULL, begin);
+	if (!(*inter_begin_pos)) {
 		goto error;
 	}
-	inter_end_pos = bt_iter_create_time_pos(NULL, end);
-	if (!inter_end_pos) {
+	*inter_end_pos = bt_iter_create_time_pos(NULL, end);
+	if (!(*inter_end_pos)) {
 		goto error;
 	}
 
-	return bt_ctf_iter_create(ctx, inter_begin_pos,
-			inter_end_pos);
+	/*
+	 * bt_ctf_iter does not take ownership of begin and end positions,
+	 * so we return them to the caller who must still assume their ownership
+	 * until the iterator is destroyed.
+	 */
+	return bt_ctf_iter_create(ctx, *inter_begin_pos,
+			*inter_end_pos);
 error:
 	return NULL;
 }
@@ -659,8 +680,7 @@ int convert_trace(struct bt_trace_descriptor *td_write,
 {
 	struct bt_ctf_iter *iter;
 	struct ctf_text_stream_pos *sout;
-	struct bt_iter_pos begin_pos;
-	struct bt_iter_pos *inter_begin_pos = NULL, *inter_end_pos = NULL;
+	struct bt_iter_pos *begin_pos = NULL, *end_pos = NULL;
 	struct bt_ctf_event *ctf_event;
 	int ret;
 
@@ -672,10 +692,11 @@ int convert_trace(struct bt_trace_descriptor *td_write,
 	}
 
 	if (opt_stream_intersection) {
-		iter = iter_create_intersect(ctx, inter_begin_pos, inter_end_pos);
+		iter = iter_create_intersect(ctx, &begin_pos, &end_pos);
 	} else {
-		begin_pos.type = BT_SEEK_BEGIN;
-		iter = bt_ctf_iter_create(ctx, &begin_pos, NULL);
+		begin_pos = bt_iter_create_time_pos(NULL, 0);
+		begin_pos->type = BT_SEEK_BEGIN;
+		iter = bt_ctf_iter_create(ctx, begin_pos, NULL);
 	}
 	if (!iter) {
 		ret = -1;
@@ -697,12 +718,8 @@ int convert_trace(struct bt_trace_descriptor *td_write,
 end:
 	bt_ctf_iter_destroy(iter);
 error_iter:
-	if (inter_begin_pos) {
-		bt_iter_free_pos(inter_begin_pos);
-	}
-	if (inter_end_pos) {
-		bt_iter_free_pos(inter_end_pos);
-	}
+	bt_iter_free_pos(begin_pos);
+	bt_iter_free_pos(end_pos);
 	return ret;
 }
 
@@ -856,6 +873,7 @@ end:
 	free(opt_input_format);
 	free(opt_output_format);
 	free(opt_output_path);
+	free(opt_debug_dir);
 	g_ptr_array_free(opt_input_paths, TRUE);
 	if (partial_error)
 		exit(EXIT_FAILURE);