From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Tue, 4 Jul 2017 17:51:29 +0000 (-0400)
Subject: flt.lttng-utils.debug-info: copy original stream's numeric ID
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=b910013b54a9afa2f41c2449df4fbcc8d36f6320

flt.lttng-utils.debug-info: copy original stream's numeric ID

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/plugins/lttng-utils/copy.c b/plugins/lttng-utils/copy.c
index 52d5b489..a2250c2c 100644
--- a/plugins/lttng-utils/copy.c
+++ b/plugins/lttng-utils/copy.c
@@ -1242,6 +1242,7 @@ struct bt_ctf_stream *insert_new_stream(
 	struct bt_ctf_stream *writer_stream = NULL;
 	struct bt_ctf_stream_class *stream_class = NULL;
 	struct bt_ctf_stream_class *writer_stream_class = NULL;
+	int64_t id;
 
 	stream_class = bt_ctf_stream_get_class(stream);
 	if (!stream_class) {
@@ -1265,8 +1266,16 @@ struct bt_ctf_stream *insert_new_stream(
 	}
 	bt_get(writer_stream_class);
 
-	writer_stream = bt_ctf_stream_create(writer_stream_class,
-			bt_ctf_stream_get_name(stream));
+	id = bt_ctf_stream_get_id(stream);
+	if (id < 0) {
+		writer_stream = bt_ctf_stream_create(writer_stream_class,
+				bt_ctf_stream_get_name(stream));
+	} else {
+		writer_stream = bt_ctf_stream_create_with_id(
+			writer_stream_class,
+			bt_ctf_stream_get_name(stream), id);
+	}
+
 	if (!writer_stream) {
 		fprintf(debug_it->err, "[error] %s in %s:%d\n",
 				__func__, __FILE__, __LINE__);