From 7b4b1ba2d44fb7c45a58f3bf96614e0d665ca3b3 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Tue, 18 Jul 2017 19:44:43 -0400 Subject: [PATCH] Fix: visit_event_decl(): always set stream_id variable MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- plugins/ctf/common/metadata/visitor-generate-ir.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/ctf/common/metadata/visitor-generate-ir.c b/plugins/ctf/common/metadata/visitor-generate-ir.c index cf7b4611..8cf147ec 100644 --- a/plugins/ctf/common/metadata/visitor-generate-ir.c +++ b/plugins/ctf/common/metadata/visitor-generate-ir.c @@ -3634,6 +3634,7 @@ int visit_event_decl(struct ctx *ctx, struct ctf_node *node) switch (stream_class_count) { case 0: /* Create implicit stream class if there's none */ + stream_id = 0; new_stream_class = create_reset_stream_class(ctx); if (!new_stream_class) { _BT_LOGE_NODE(node, @@ -3642,7 +3643,8 @@ int visit_event_decl(struct ctx *ctx, struct ctf_node *node) goto error; } - ret = bt_ctf_stream_class_set_id(new_stream_class, 0); + ret = bt_ctf_stream_class_set_id(new_stream_class, + stream_id); if (ret) { _BT_LOGE_NODE(node, "Cannot set stream class's ID: " @@ -3658,6 +3660,8 @@ int visit_event_decl(struct ctx *ctx, struct ctf_node *node) goto error; } + *new_stream_id = stream_id; + /* Move reference to visitor's context */ g_hash_table_insert(ctx->stream_classes, new_stream_id, new_stream_class); -- 2.34.1