flt.utils.muxer: do not release upstream iterators when they're ended

[babeltrace.git] / plugins / text / pretty / print.c

diff --git a/plugins/text/pretty/print.c b/plugins/text/pretty/print.c
index b3afd57387cbb566d08462ed0dea001ae5d0285f..3f850b11b54b446602503eda7680bb5f744d7271 100644 (file)
--- a/plugins/text/pretty/print.c
+++ b/plugins/text/pretty/print.c
@@ -78,17 +78,9 @@ void print_field_name_equal(struct pretty_component *pretty, const char *name)
 
 static
 void print_timestamp_cycles(struct pretty_component *pretty,
-               const bt_event *event)
+               const bt_clock_snapshot *clock_snapshot)
 {
-       const bt_clock_snapshot *clock_snapshot;
        uint64_t cycles;
-       bt_clock_snapshot_state cs_state;
-
-       cs_state = bt_event_borrow_default_clock_snapshot_const(event, &clock_snapshot);
-       if (cs_state != BT_CLOCK_SNAPSHOT_STATE_KNOWN || !clock_snapshot) {
-               g_string_append(pretty->string, "????????????????????");
-               return;
-       }
 
        cycles = bt_clock_snapshot_get_value(clock_snapshot);
        g_string_append_printf(pretty->string, "%020" PRIu64, cycles);
@@ -96,6 +88,7 @@ void print_timestamp_cycles(struct pretty_component *pretty,
        if (pretty->last_cycles_timestamp != -1ULL) {
                pretty->delta_cycles = cycles - pretty->last_cycles_timestamp;
        }
+
        pretty->last_cycles_timestamp = cycles;
 }
 
@@ -216,31 +209,24 @@ end:
 
 static
 int print_event_timestamp(struct pretty_component *pretty,
-               const bt_event *event, bool *start_line)
+               const bt_message *event_msg, bool *start_line)
 {
        bool print_names = pretty->options.print_header_field_names;
        int ret = 0;
-       const bt_stream *stream = NULL;
-       const bt_stream_class *stream_class = NULL;
        const bt_clock_snapshot *clock_snapshot = NULL;
-       bt_clock_snapshot_state cs_state;
 
-       stream = bt_event_borrow_stream_const(event);
-       if (!stream) {
-               ret = -1;
+       if (!bt_message_event_borrow_stream_class_default_clock_class_const(
+                       event_msg)) {
+               /* No default clock class: skip the timestamp without an error */
                goto end;
        }
 
-       stream_class = bt_stream_borrow_class_const(stream);
-       if (!stream_class) {
-               ret = -1;
-               goto end;
-       }
-
-       cs_state = bt_event_borrow_default_clock_snapshot_const(event,
-               &clock_snapshot);
-       if (cs_state != BT_CLOCK_SNAPSHOT_STATE_KNOWN || !clock_snapshot) {
-               /* No default clock value: skip the timestamp without an error */
+       if (bt_message_event_borrow_default_clock_snapshot_const(event_msg,
+                       &clock_snapshot) != BT_CLOCK_SNAPSHOT_STATE_KNOWN) {
+               /*
+                * No known default clock value: skip the timestamp
+                * without an error.
+                */
                goto end;
        }
 
@@ -253,11 +239,8 @@ int print_event_timestamp(struct pretty_component *pretty,
                g_string_append(pretty->string, COLOR_TIMESTAMP);
        }
        if (pretty->options.print_timestamp_cycles) {
-               print_timestamp_cycles(pretty, event);
+               print_timestamp_cycles(pretty, clock_snapshot);
        } else {
-               clock_snapshot = NULL;
-               cs_state = bt_event_borrow_default_clock_snapshot_const(event,
-                       &clock_snapshot);
                print_timestamp_wall(pretty, clock_snapshot);
        }
        if (pretty->use_colors) {
@@ -277,7 +260,7 @@ int print_event_timestamp(struct pretty_component *pretty,
                if (pretty->options.print_timestamp_cycles) {
                        if (pretty->delta_cycles == -1ULL) {
                                g_string_append(pretty->string,
-                                       "+??????????\?\?) "); /* Not a trigraph. */
+                                       "+??????????\?\?"); /* Not a trigraph. */
                        } else {
                                g_string_append_printf(pretty->string,
                                        "+%012" PRIu64, pretty->delta_cycles);
@@ -308,7 +291,7 @@ end:
 
 static
 int print_event_header(struct pretty_component *pretty,
-               const bt_event *event)
+               const bt_message *event_msg)
 {
        bool print_names = pretty->options.print_header_field_names;
        int ret = 0;
@@ -318,6 +301,7 @@ int print_event_header(struct pretty_component *pretty,
        const bt_packet *packet = NULL;
        const bt_stream *stream = NULL;
        const bt_trace *trace = NULL;
+       const bt_event *event = bt_message_event_borrow_event_const(event_msg);
        int dom_print = 0;
        bt_property_availability prop_avail;
 
@@ -327,7 +311,7 @@ int print_event_header(struct pretty_component *pretty,
        packet = bt_event_borrow_packet_const(event);
        stream = bt_packet_borrow_stream_const(packet);
        trace = bt_stream_borrow_trace_const(stream);
-       ret = print_event_timestamp(pretty, event, &pretty->start_line);
+       ret = print_event_timestamp(pretty, event_msg, &pretty->start_line);
        if (ret) {
                goto end;
        }
@@ -1180,7 +1164,7 @@ int pretty_print_event(struct pretty_component *pretty,
        BT_ASSERT(event);
        pretty->start_line = true;
        g_string_assign(pretty->string, "");
-       ret = print_event_header(pretty, event);
+       ret = print_event_header(pretty, event_msg);
        if (ret != 0) {
                goto end;
        }
@@ -1230,6 +1214,7 @@ int print_discarded_elements_msg(struct pretty_component *pretty,
        bt_uuid trace_uuid;
        int64_t stream_class_id;
        int64_t stream_id;
+       const char *init_msg;
 
        /* Stream name */
        stream_name = bt_stream_get_name(stream);
@@ -1259,16 +1244,22 @@ int print_discarded_elements_msg(struct pretty_component *pretty,
 
        /* Format message */
        g_string_assign(pretty->string, "");
+
+       if (count == UINT64_C(-1)) {
+               init_msg = "Tracer may have discarded";
+       } else {
+               init_msg = "Tracer discarded";
+       }
+
        g_string_append_printf(pretty->string,
-               "%s%sWARNING%s%s: Tracer discarded ",
+               "%s%sWARNING%s%s: %s ",
                bt_common_color_fg_yellow(),
                bt_common_color_bold(),
                bt_common_color_reset(),
-               bt_common_color_fg_yellow());
+               bt_common_color_fg_yellow(), init_msg);
 
        if (count == UINT64_C(-1)) {
-               g_string_append_printf(pretty->string, "a number of %ss",
-                       elem_type);
+               g_string_append_printf(pretty->string, "%ss", elem_type);
        } else {
                g_string_append_printf(pretty->string,
                        "%" PRIu64 " %s%s", count, elem_type,