projects / babeltrace.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix old-style-declaration warnings
[babeltrace.git] / lib / lib-logging.c
diff --git a/lib/lib-logging.c b/lib/lib-logging.c
index 0872cc26bbc9af334654026e83e292cf5e95c3c8..11ba9e71ce443a622b3f23f32a69d2d103f8e5ca 100644 (file)
--- a/lib/lib-logging.c
+++ b/lib/lib-logging.c
@@ -62,7 +62,7 @@
 #include <babeltrace/graph/connection-internal.h>
 #include <babeltrace/graph/graph-internal.h>
 #include <babeltrace/graph/message-event-internal.h>
-#include <babeltrace/graph/message-inactivity-internal.h>
+#include <babeltrace/graph/message-message-iterator-inactivity-internal.h>
 #include <babeltrace/graph/message-internal.h>
 #include <babeltrace/graph/message-iterator-internal.h>
 #include <babeltrace/graph/message-packet-internal.h>
@@ -75,7 +75,7 @@
 
 #define LIB_LOGGING_BUF_SIZE   (4096 * 4)
 
-static char __thread lib_logging_buf[LIB_LOGGING_BUF_SIZE];
+static __thread char lib_logging_buf[LIB_LOGGING_BUF_SIZE];
 
 #define BUF_APPEND(_fmt, ...)                                          \
        do {                                                            \
@@ -409,24 +409,34 @@ static inline void format_field_path(char **buf_ch, bool extended,
 {
        uint64_t i;
 
-       if (field_path->indexes) {
-               BT_ASSERT(field_path->indexes);
-               BUF_APPEND(", %sindex-count=%u",
-                       PRFIELD(field_path->indexes->len));
+       if (field_path->items) {
+               BT_ASSERT(field_path->items);
+               BUF_APPEND(", %sitem-count=%u",
+                       PRFIELD(field_path->items->len));
        }
 
-       if (!extended || !field_path->indexes) {
+       if (!extended || !field_path->items) {
                return;
        }
 
        BUF_APPEND(", %spath=[%s",
                PRFIELD(bt_common_scope_string(field_path->root)));
 
-       for (i = 0; i < field_path->indexes->len; i++) {
-               uint64_t index = bt_field_path_get_index_by_index_inline(
-                       field_path, i);
-
-               BUF_APPEND(", %" PRIu64, index);
+       for (i = 0; i < bt_field_path_get_item_count(field_path); i++) {
+               const struct bt_field_path_item *fp_item =
+                       bt_field_path_borrow_item_by_index_const(field_path, i);
+
+               switch (bt_field_path_item_get_type(fp_item)) {
+               case BT_FIELD_PATH_ITEM_TYPE_INDEX:
+                       BUF_APPEND(", %" PRIu64,
+                               bt_field_path_item_index_get_index(fp_item));
+                       break;
+               case BT_FIELD_PATH_ITEM_TYPE_CURRENT_ARRAY_ELEMENT:
+                       BUF_APPEND("%s", ", <CUR>");
+                       break;
+               default:
+                       abort();
+               }
        }
 
        BUF_APPEND("%s", "]");
@@ -479,8 +489,6 @@ static inline void format_trace(char **buf_ch, bool extended,
                        PRFIELD(trace->streams->len));
        }
 
-       BUF_APPEND(", %sis-static=%d", PRFIELD(trace->is_static));
-
        if (!trace->class) {
                return;
        }
@@ -531,7 +539,7 @@ static inline void format_stream_class(char **buf_ch, bool extended,
        SET_TMP_PREFIX("trace-class-");
        format_trace_class(buf_ch, false, tmp_prefix, trace_class);
        SET_TMP_PREFIX("pcf-pool-");
-       format_object_pool(buf_ch, extended, prefix,
+       format_object_pool(buf_ch, extended, tmp_prefix,
                &stream_class->packet_context_field_pool);
 }
 
@@ -587,7 +595,8 @@ static inline void format_event_class(char **buf_ch, bool extended,
        SET_TMP_PREFIX("trace-class-");
        format_trace_class(buf_ch, false, tmp_prefix, trace_class);
        SET_TMP_PREFIX("event-pool-");
-       format_object_pool(buf_ch, extended, prefix, &event_class->event_pool);
+       format_object_pool(buf_ch, extended, tmp_prefix,
+               &event_class->event_pool);
 }
 
 static inline void format_stream(char **buf_ch, bool extended,
@@ -630,7 +639,7 @@ static inline void format_stream(char **buf_ch, bool extended,
        }
 
        SET_TMP_PREFIX("packet-pool-");
-       format_object_pool(buf_ch, extended, prefix, &stream->packet_pool);
+       format_object_pool(buf_ch, extended, tmp_prefix, &stream->packet_pool);
 }
 
 static inline void format_packet(char **buf_ch, bool extended,
@@ -712,12 +721,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;
@@ -762,16 +765,17 @@ 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-");
-       format_object_pool(buf_ch, extended, prefix, &clock_class->cs_pool);
+       format_object_pool(buf_ch, extended, tmp_prefix,
+               &clock_class->cs_pool);
 }
 
 static inline void format_clock_snapshot(char **buf_ch, bool extended,
@@ -815,11 +819,16 @@ static inline void format_value(char **buf_ch, bool extended,
                BUF_APPEND(", %svalue=%d", PRFIELD(val));
                break;
        }
-       case BT_VALUE_TYPE_INTEGER:
+       case BT_VALUE_TYPE_UNSIGNED_INTEGER:
        {
-               int64_t val = bt_value_integer_get(value);
-
-               BUF_APPEND(", %svalue=%" PRId64, PRFIELD(val));
+               BUF_APPEND(", %svalue=%" PRIu64,
+                       PRFIELD(bt_value_unsigned_integer_get(value)));
+               break;
+       }
+       case BT_VALUE_TYPE_SIGNED_INTEGER:
+       {
+               BUF_APPEND(", %svalue=%" PRId64,
+                       PRFIELD(bt_value_signed_integer_get(value)));
                break;
        }
        case BT_VALUE_TYPE_REAL:
@@ -884,6 +893,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:
@@ -934,6 +949,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:
@@ -1086,7 +1107,11 @@ static inline void format_graph(char **buf_ch, bool extended,
 {
        char tmp_prefix[64];
 
-       BUF_APPEND(", %sis-canceled=%d", PRFIELD(graph->canceled));
+       BUF_APPEND(", %sis-canceled=%d, %scan-consume=%d, "
+               "%sconfig-state=%s",
+               PRFIELD(graph->canceled),
+               PRFIELD(graph->can_consume),
+               PRFIELD(bt_graph_configuration_state_string(graph->config_state)));
 
        if (!extended) {
                return;
@@ -1103,13 +1128,13 @@ static inline void format_graph(char **buf_ch, bool extended,
        }
 
        SET_TMP_PREFIX("en-pool-");
-       format_object_pool(buf_ch, extended, prefix,
+       format_object_pool(buf_ch, extended, tmp_prefix,
                &graph->event_msg_pool);
        SET_TMP_PREFIX("pbn-pool-");
-       format_object_pool(buf_ch, extended, prefix,
+       format_object_pool(buf_ch, extended, tmp_prefix,
                &graph->packet_begin_msg_pool);
        SET_TMP_PREFIX("pen-pool-");
-       format_object_pool(buf_ch, extended, prefix,
+       format_object_pool(buf_ch, extended, tmp_prefix,
                &graph->packet_end_msg_pool);
 }
 
@@ -1367,7 +1392,6 @@ update_fmt:
        *out_fmt_ch = fmt_ch;
 }
 
-BT_HIDDEN
 void bt_lib_log(const char *func, const char *file, unsigned line,
                int lvl, const char *tag, const char *fmt, ...)
 {
BabelTrace - Trace Format Babel Tower
This page took 0.026942 seconds and 4 git commands to generate.