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 <eeppeliteloop@gmail.com>
Change-Id: I4c75bc487c10fa2a4b39708d09d4089887ceabbd
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2074
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>

diff --git a/src/plugins/text/details/write.c b/src/plugins/text/details/write.c
index 78ab04dcc5dc613854146947a7dbbf4afae552aa..aa45d3d08e746abbd8ba5d59225be8d11363246a 100644 (file)
--- 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 8059c779e77ebd9ad46bbb9245bd5d767f7e971b..bce10d4375a47cde574bfb6963904cdf4f45699c 100644 (file)
--- 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 0d4b5fb64f56a9825555bcd344e6854077edab73..9fb33b043a3fcca542bd6f40adf63dcdce6286e2 100644 (file)
--- 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 23806ccaaa5bb246189877fcbf30cae4e67da702..f2bcf31710fb8eeea9ae818af1cca2178a6d42e5 100644 (file)
--- 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 bdca129f261a563afbd2abc47f66977b95e8a935..9b1cce5fcf59483bd73ba1f17aad2cb27f11da6a 100644 (file)
--- 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 8eadeecdddfab155c07082734dcbfbaf32d2d68f..073a89096b7b27abc833da0b8f6e2605c9f686c5 100644 (file)
--- 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 cda3466c2a7c012c5fc4cb270e611921129b12b4..4c37fec193c093555fb041ae58014499185a67ec 100644 (file)
--- 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 545d6f976cf6f55a14384069fe85d8afe050d24f..019b2e2eddc89c46640abadc5a0b5b7a856be452 100644 (file)
--- 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 bd0ebcf099b27cfd2bb35a9f0c614a08ddbaba58..628924920a62b01a6608d2fe66e2a4ceaf554c38 100644 (file)
--- 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 e13461e50fea1b0fe5371eb432b28c70e4870073..dbdc6579d847098d2e9824986e44f3fb36707420 100644 (file)
--- 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 05cf63db6875429133ab80b2ba3916c7a5834f89..e3af433bea86c67051d26250499c85e88df259c7 100644 (file)
--- 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 e5c47e7fded9c51584e0ba6d0fd24d68cb5a53b3..f48eccd6b46c8fe4647fd133f8a764f085dd6871 100644 (file)
--- 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):