X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=2b7817ad3dd98bc99d5bce4282a9c607d35c853a;hb=8200883463ae0329f8f5053d898614fd5051abc3;hp=c521ac1516c459641b24ec476f4c425ad09fcfe4;hpb=3842465694945829d76452ff83924aa0103c6293;p=babeltrace.git

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index c521ac15..2b7817ad 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,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;
 
@@ -101,6 +104,8 @@ enum {
 	OPT_CLOCK_DATE,
 	OPT_CLOCK_GMT,
 	OPT_CLOCK_FORCE_CORRELATE,
+	OPT_STREAM_INTERSECTION,
+	OPT_DEBUG_DIR,
 };
 
 /*
@@ -130,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 },
 };
 
@@ -175,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");
 }
@@ -349,7 +363,7 @@ static int parse_options(int argc, char **argv)
 				goto end;
 			}
 			errno = 0;
-			opt_clock_offset = strtoull(str, &endptr, 0);
+			opt_clock_offset = strtoll(str, &endptr, 0);
 			if (*endptr != '\0' || str == endptr || errno != 0) {
 				fprintf(stderr, "[error] Incorrect --clock-offset argument: %s\n", str);
 				ret = -EINVAL;
@@ -374,7 +388,7 @@ static int parse_options(int argc, char **argv)
 				goto end;
 			}
 			errno = 0;
-			opt_clock_offset_ns = strtoull(str, &endptr, 0);
+			opt_clock_offset_ns = strtoll(str, &endptr, 0);
 			if (*endptr != '\0' || str == endptr || errno != 0) {
 				fprintf(stderr, "[error] Incorrect --clock-offset-ns argument: %s\n", str);
 				ret = -EINVAL;
@@ -394,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;
@@ -621,18 +644,24 @@ 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 *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 = bt_ctf_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;
@@ -644,14 +673,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;
 }
 
@@ -805,6 +837,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);