lib: rename clock class's absolute property to "origin is Unix epoch"

[babeltrace.git] / lib / lib-logging.c

diff --git a/lib/lib-logging.c b/lib/lib-logging.c
index c48149be002e2ba80d4c73bd25382138a523ac60..daee2a00e320a28fdeb5ce818a7d3b5ac7193de7 100644 (file)
--- a/lib/lib-logging.c
+++ b/lib/lib-logging.c
@@ -524,17 +524,9 @@ static inline void format_stream_class(char **buf_ch, bool extended,
                return;
        }
 
-       BUF_APPEND(", %sassigns-auto-ec-id=%d, %sassigns-auto-stream-id=%d, "
-               "%spackets-have-discarded-ev-counter-snapshot=%d, "
-               "%spackets-have-packet-counter-snapshot=%d, "
-               "%spackets-have-default-begin-cs=%d, "
-               "%spackets-have-default-end-cs=%d",
+       BUF_APPEND(", %sassigns-auto-ec-id=%d, %sassigns-auto-stream-id=%d",
                PRFIELD(stream_class->assigns_automatic_event_class_id),
-               PRFIELD(stream_class->assigns_automatic_stream_id),
-               PRFIELD(stream_class->packets_have_discarded_event_counter_snapshot),
-               PRFIELD(stream_class->packets_have_packet_counter_snapshot),
-               PRFIELD(stream_class->packets_have_default_beginning_cs),
-               PRFIELD(stream_class->packets_have_default_end_cs));
+               PRFIELD(stream_class->assigns_automatic_stream_id));
        BUF_APPEND(", %strace-class-addr=%p", PRFIELD(trace_class));
        SET_TMP_PREFIX("trace-class-");
        format_trace_class(buf_ch, false, tmp_prefix, trace_class);
@@ -660,28 +652,6 @@ static inline void format_packet(char **buf_ch, bool extended,
                return;
        }
 
-       if (packet->default_beginning_cs) {
-               SET_TMP_PREFIX("default-begin-cs-");
-               format_clock_snapshot(buf_ch, true, tmp_prefix,
-                       packet->default_beginning_cs);
-       }
-
-       if (packet->default_end_cs) {
-               SET_TMP_PREFIX("default-end-cs-");
-               format_clock_snapshot(buf_ch, true, tmp_prefix,
-                       packet->default_end_cs);
-       }
-
-       if (packet->discarded_event_counter_snapshot.base.avail) {
-               BUF_APPEND(", %sdiscarded-ev-counter-snapshot=%" PRIu64,
-                       PRFIELD(packet->discarded_event_counter_snapshot.value));
-       }
-
-       if (packet->packet_counter_snapshot.base.avail) {
-               BUF_APPEND(", %spacket-counter-snapshot=%" PRIu64,
-                       PRFIELD(packet->packet_counter_snapshot.value));
-       }
-
        BUF_APPEND(", %sstream-addr=%p", PRFIELD(stream));
        SET_TMP_PREFIX("stream-");
        format_stream(buf_ch, false, tmp_prefix, stream);
@@ -742,12 +712,6 @@ static inline void format_event(char **buf_ch, bool extended,
                }
        }
 
-       if (event->default_cs) {
-               SET_TMP_PREFIX("default-cs-");
-               format_clock_snapshot(buf_ch, true, tmp_prefix,
-                       event->default_cs);
-       }
-
        packet = bt_event_borrow_packet_const(event);
        if (!packet) {
                return;
@@ -792,12 +756,12 @@ static inline void format_clock_class(char **buf_ch, bool extended,
 
        BUF_APPEND(", %sis-frozen=%d, %sprecision=%" PRIu64 ", "
                "%soffset-s=%" PRId64 ", "
-               "%soffset-cycles=%" PRIu64 ", %sis-absolute=%d, "
+               "%soffset-cycles=%" PRIu64 ", %sorigin-is-unix-epoch=%d, "
                "%sbase-offset-ns=%" PRId64,
                PRFIELD(clock_class->frozen), PRFIELD(clock_class->precision),
                PRFIELD(clock_class->offset_seconds),
                PRFIELD(clock_class->offset_cycles),
-               PRFIELD(clock_class->is_absolute),
+               PRFIELD(clock_class->origin_is_unix_epoch),
                PRFIELD(clock_class->base_offset.value_ns));
 
        SET_TMP_PREFIX("cs-pool-");
@@ -914,6 +878,12 @@ static inline void format_message(char **buf_ch, bool extended,
                                msg_event->event);
                }
 
+               if (msg_event->default_cs) {
+                       SET_TMP_PREFIX("default-cs-");
+                       format_clock_snapshot(buf_ch, true, tmp_prefix,
+                               msg_event->default_cs);
+               }
+
                break;
        }
        case BT_MESSAGE_TYPE_STREAM_BEGINNING:
@@ -964,6 +934,12 @@ static inline void format_message(char **buf_ch, bool extended,
                                msg_packet->packet);
                }
 
+               if (msg_packet->default_cs) {
+                       SET_TMP_PREFIX("default-cs-");
+                       format_clock_snapshot(buf_ch, true, tmp_prefix,
+                               msg_packet->default_cs);
+               }
+
                break;
        }
        case BT_MESSAGE_TYPE_DISCARDED_EVENTS: