From 340be5dd408640e5b2fd3fe3cbe22ec64bbe79d8 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Fri, 20 Sep 2019 04:25:26 -0400 Subject: [PATCH] sink.text.details: don't write `:` after `Packet beginning` without ctx This patch fixes packet beginning lines which look like: ... Stream (ID 0, Class ID 0) {Trace 0, Stream class ID 0, Stream ID 0} Packet beginning: {Trace 0, Stream class ID 0, Stream ID 0} ... so that they become: ... Stream (ID 0, Class ID 0) {Trace 0, Stream class ID 0, Stream ID 0} Packet beginning {Trace 0, Stream class ID 0, Stream ID 0} ... In other words, the `:` character following `Packet beginning` is useless as there's no (packet context) data following. Signed-off-by: Philippe Proulx Change-Id: I4c75bc487c10fa2a4b39708d09d4089887ceabbd Reviewed-on: https://review.lttng.org/c/babeltrace/+/2074 Reviewed-by: Francis Deslauriers Reviewed-by: Simon Marchi --- src/plugins/text/details/write.c | 9 +++++---- .../flt.utils.muxer/succeed/multi_iter_ordering.expect | 2 +- .../data/plugins/sink.ctf.fs/succeed/trace-double.expect | 2 +- .../data/plugins/sink.ctf.fs/succeed/trace-float.expect | 2 +- .../succeed/trace-meta-variant-no-underscore.expect | 2 +- .../succeed/trace-meta-variant-one-underscore.expect | 2 +- .../succeed/trace-meta-variant-reserved-keywords.expect | 2 +- .../trace-meta-variant-same-with-underscore.expect | 2 +- .../succeed/trace-meta-variant-two-underscores.expect | 2 +- .../succeed/trace-barectf-event-before-packet.expect | 4 ++-- .../data/plugins/src.ctf.fs/succeed/trace-simple.expect | 2 +- .../plugins/src.ctf.fs/succeed/trace-smalltrace.expect | 2 +- 12 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/plugins/text/details/write.c b/src/plugins/text/details/write.c index 78ab04dc..aa45d3d0 100644 --- a/src/plugins/text/details/write.c +++ b/src/plugins/text/details/write.c @@ -2340,15 +2340,16 @@ int write_packet_beginning_message(struct details_write_ctx *ctx, } /* Write field */ - g_string_append(ctx->str, ":\n"); - incr_indent(ctx); field = bt_packet_borrow_context_field_const(packet); if (field) { + g_string_append(ctx->str, ":\n"); + incr_indent(ctx); write_root_field(ctx, "Context", field); + decr_indent(ctx); + } else { + write_nl(ctx); } - decr_indent(ctx); - end: return ret; } diff --git a/tests/data/plugins/flt.utils.muxer/succeed/multi_iter_ordering.expect b/tests/data/plugins/flt.utils.muxer/succeed/multi_iter_ordering.expect index 8059c779..bce10d43 100644 --- a/tests/data/plugins/flt.utils.muxer/succeed/multi_iter_ordering.expect +++ b/tests/data/plugins/flt.utils.muxer/succeed/multi_iter_ordering.expect @@ -28,7 +28,7 @@ Event `saumon atlantique` (Class ID 0): [25 cycles, 25,000,000,000 ns from origin] {Trace 1, Stream class ID 0, Stream ID 1} -Packet beginning: +Packet beginning [25 cycles, 25,000,000,000 ns from origin] {Trace 2, Stream class ID 1, Stream ID 1} diff --git a/tests/data/plugins/sink.ctf.fs/succeed/trace-double.expect b/tests/data/plugins/sink.ctf.fs/succeed/trace-double.expect index 0d4b5fb6..9fb33b04 100644 --- a/tests/data/plugins/sink.ctf.fs/succeed/trace-double.expect +++ b/tests/data/plugins/sink.ctf.fs/succeed/trace-double.expect @@ -26,7 +26,7 @@ Stream beginning: [0 cycles, 0 ns from origin] {Trace 0, Stream class ID 0, Stream ID 0} -Packet beginning: +Packet beginning [0 cycles, 0 ns from origin] {Trace 0, Stream class ID 0, Stream ID 0} diff --git a/tests/data/plugins/sink.ctf.fs/succeed/trace-float.expect b/tests/data/plugins/sink.ctf.fs/succeed/trace-float.expect index 23806cca..f2bcf317 100644 --- a/tests/data/plugins/sink.ctf.fs/succeed/trace-float.expect +++ b/tests/data/plugins/sink.ctf.fs/succeed/trace-float.expect @@ -26,7 +26,7 @@ Stream beginning: [0 cycles, 0 ns from origin] {Trace 0, Stream class ID 0, Stream ID 0} -Packet beginning: +Packet beginning [0 cycles, 0 ns from origin] {Trace 0, Stream class ID 0, Stream ID 0} diff --git a/tests/data/plugins/sink.ctf.fs/succeed/trace-meta-variant-no-underscore.expect b/tests/data/plugins/sink.ctf.fs/succeed/trace-meta-variant-no-underscore.expect index bdca129f..9b1cce5f 100644 --- a/tests/data/plugins/sink.ctf.fs/succeed/trace-meta-variant-no-underscore.expect +++ b/tests/data/plugins/sink.ctf.fs/succeed/trace-meta-variant-no-underscore.expect @@ -23,7 +23,7 @@ Stream beginning: Stream (ID 0, Class ID 0) {Trace 0, Stream class ID 0, Stream ID 0} -Packet beginning: +Packet beginning {Trace 0, Stream class ID 0, Stream ID 0} Event `yo` (Class ID 0): diff --git a/tests/data/plugins/sink.ctf.fs/succeed/trace-meta-variant-one-underscore.expect b/tests/data/plugins/sink.ctf.fs/succeed/trace-meta-variant-one-underscore.expect index 8eadeecd..073a8909 100644 --- a/tests/data/plugins/sink.ctf.fs/succeed/trace-meta-variant-one-underscore.expect +++ b/tests/data/plugins/sink.ctf.fs/succeed/trace-meta-variant-one-underscore.expect @@ -23,7 +23,7 @@ Stream beginning: Stream (ID 0, Class ID 0) {Trace 0, Stream class ID 0, Stream ID 0} -Packet beginning: +Packet beginning {Trace 0, Stream class ID 0, Stream ID 0} Event `yo` (Class ID 0): diff --git a/tests/data/plugins/sink.ctf.fs/succeed/trace-meta-variant-reserved-keywords.expect b/tests/data/plugins/sink.ctf.fs/succeed/trace-meta-variant-reserved-keywords.expect index cda3466c..4c37fec1 100644 --- a/tests/data/plugins/sink.ctf.fs/succeed/trace-meta-variant-reserved-keywords.expect +++ b/tests/data/plugins/sink.ctf.fs/succeed/trace-meta-variant-reserved-keywords.expect @@ -73,7 +73,7 @@ Stream beginning: Stream (ID 0, Class ID 0) {Trace 0, Stream class ID 0, Stream ID 0} -Packet beginning: +Packet beginning {Trace 0, Stream class ID 0, Stream ID 0} Event `yo` (Class ID 0): diff --git a/tests/data/plugins/sink.ctf.fs/succeed/trace-meta-variant-same-with-underscore.expect b/tests/data/plugins/sink.ctf.fs/succeed/trace-meta-variant-same-with-underscore.expect index 545d6f97..019b2e2e 100644 --- a/tests/data/plugins/sink.ctf.fs/succeed/trace-meta-variant-same-with-underscore.expect +++ b/tests/data/plugins/sink.ctf.fs/succeed/trace-meta-variant-same-with-underscore.expect @@ -23,7 +23,7 @@ Stream beginning: Stream (ID 0, Class ID 0) {Trace 0, Stream class ID 0, Stream ID 0} -Packet beginning: +Packet beginning {Trace 0, Stream class ID 0, Stream ID 0} Event `yo` (Class ID 0): diff --git a/tests/data/plugins/sink.ctf.fs/succeed/trace-meta-variant-two-underscores.expect b/tests/data/plugins/sink.ctf.fs/succeed/trace-meta-variant-two-underscores.expect index bd0ebcf0..62892492 100644 --- a/tests/data/plugins/sink.ctf.fs/succeed/trace-meta-variant-two-underscores.expect +++ b/tests/data/plugins/sink.ctf.fs/succeed/trace-meta-variant-two-underscores.expect @@ -23,7 +23,7 @@ Stream beginning: Stream (ID 0, Class ID 0) {Trace 0, Stream class ID 0, Stream ID 0} -Packet beginning: +Packet beginning {Trace 0, Stream class ID 0, Stream ID 0} Event `yo` (Class ID 0): diff --git a/tests/data/plugins/src.ctf.fs/succeed/trace-barectf-event-before-packet.expect b/tests/data/plugins/src.ctf.fs/succeed/trace-barectf-event-before-packet.expect index e13461e5..dbdc6579 100644 --- a/tests/data/plugins/src.ctf.fs/succeed/trace-barectf-event-before-packet.expect +++ b/tests/data/plugins/src.ctf.fs/succeed/trace-barectf-event-before-packet.expect @@ -34,7 +34,7 @@ Stream beginning: [1,048,932,916,574,076 cycles, 1,435,121,820,916,574,076 ns from origin] {Trace 0, Stream class ID 0, Stream ID 0} -Packet beginning: +Packet beginning [1,048,932,916,580,091 cycles, 1,435,121,820,916,580,091 ns from origin] {Trace 0, Stream class ID 0, Stream ID 0} @@ -48,7 +48,7 @@ Packet end [1,048,932,916,605,259 cycles, 1,435,121,820,916,605,259 ns from origin] {Trace 0, Stream class ID 0, Stream ID 0} -Packet beginning: +Packet beginning [1,048,932,916,605,259 cycles, 1,435,121,820,916,605,259 ns from origin] {Trace 0, Stream class ID 0, Stream ID 0} diff --git a/tests/data/plugins/src.ctf.fs/succeed/trace-simple.expect b/tests/data/plugins/src.ctf.fs/succeed/trace-simple.expect index 05cf63db..e3af433b 100644 --- a/tests/data/plugins/src.ctf.fs/succeed/trace-simple.expect +++ b/tests/data/plugins/src.ctf.fs/succeed/trace-simple.expect @@ -26,7 +26,7 @@ Stream beginning: [0 cycles, 0 ns from origin] {Trace 0, Stream class ID 0, Stream ID 0} -Packet beginning: +Packet beginning [3600 cycles, 3600 ns from origin] {Trace 0, Stream class ID 0, Stream ID 0} diff --git a/tests/data/plugins/src.ctf.fs/succeed/trace-smalltrace.expect b/tests/data/plugins/src.ctf.fs/succeed/trace-smalltrace.expect index e5c47e7f..f48eccd6 100644 --- a/tests/data/plugins/src.ctf.fs/succeed/trace-smalltrace.expect +++ b/tests/data/plugins/src.ctf.fs/succeed/trace-smalltrace.expect @@ -16,7 +16,7 @@ Stream beginning: Stream (ID 0, Class ID 0) {Trace 0, Stream class ID 0, Stream ID 0} -Packet beginning: +Packet beginning {Trace 0, Stream class ID 0, Stream ID 0} Event `string` (Class ID 0): -- 2.34.1