X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=e5aaab6bddece0ba8b4ee62e093beeecfd961a0e;hb=34a4aed0c436c70a3d1661451933dc8578cdea9e;hp=0ceca0c40081ec9c4a721a47b59c33b2eb526ec7;hpb=2875672988a4ff834617379e222a3c109fb5d903;p=babeltrace.git

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 0ceca0c4..e5aaab6b 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -26,8 +26,6 @@
  * SOFTWARE.
  */
 
-#define _GNU_SOURCE
-#include <config.h>
 #include <babeltrace/babeltrace.h>
 #include <babeltrace/format.h>
 #include <babeltrace/context.h>
@@ -38,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>
@@ -72,6 +72,7 @@ static char *opt_input_format, *opt_output_format;
  */
 static GPtrArray *opt_input_paths;
 static char *opt_output_path;
+static int opt_stream_intersection;
 
 static struct bt_format *fmt_read;
 
@@ -103,6 +104,8 @@ enum {
 	OPT_CLOCK_DATE,
 	OPT_CLOCK_GMT,
 	OPT_CLOCK_FORCE_CORRELATE,
+	OPT_STREAM_INTERSECTION,
+	OPT_DEBUG_DIR,
 };
 
 /*
@@ -132,6 +135,10 @@ static struct poptOption long_options[] = {
 	{ "clock-date", 0, POPT_ARG_NONE, NULL, OPT_CLOCK_DATE, NULL, NULL },
 	{ "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 },
 };
 
@@ -177,6 +184,11 @@ static void usage(FILE *fp)
 	fprintf(fp, "      --clock-gmt                Print clock in GMT time zone (default: local time zone)\n");
 	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");
 }
@@ -396,7 +408,16 @@ static int parse_options(int argc, char **argv)
 		case OPT_CLOCK_FORCE_CORRELATE:
 			opt_clock_force_correlate = 1;
 			break;
-
+		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;
@@ -617,24 +638,66 @@ end:
 	return ret;
 }
 
+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)
+{
+	uint64_t begin = 0, end = ULLONG_MAX;
+	int ret;
+
+	ret = ctf_find_packets_intersection(ctx, &begin, &end);
+	if (ret == 1) {
+		fprintf(stderr, "[error] No intersection found between trace files.\n");
+		ret = -1;
+		goto error;
+	} else if (ret != 0) {
+		goto error;
+	}
+	*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)) {
+		goto error;
+	}
+
+	/*
+	 * 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;
+}
+
 static
 int convert_trace(struct bt_trace_descriptor *td_write,
 		  struct bt_context *ctx)
 {
 	struct bt_ctf_iter *iter;
 	struct ctf_text_stream_pos *sout;
-	struct bt_iter_pos begin_pos;
+	struct bt_iter_pos *begin_pos = NULL, *end_pos = NULL;
 	struct bt_ctf_event *ctf_event;
 	int ret;
 
 	sout = container_of(td_write, struct ctf_text_stream_pos,
 			trace_descriptor);
 
-	if (!sout->parent.event_cb)
+	if (!sout->parent.event_cb) {
 		return 0;
+	}
 
-	begin_pos.type = BT_SEEK_BEGIN;
-	iter = bt_ctf_iter_create(ctx, &begin_pos, NULL);
+	if (opt_stream_intersection) {
+		iter = iter_create_intersect(ctx, &begin_pos, &end_pos);
+	} else {
+		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;
 		goto error_iter;
@@ -646,14 +709,17 @@ 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 < 0) {
 			goto end;
+		}
 	}
 	ret = 0;
 
 end:
 	bt_ctf_iter_destroy(iter);
 error_iter:
+	bt_iter_free_pos(begin_pos);
+	bt_iter_free_pos(end_pos);
 	return ret;
 }
 
@@ -807,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);