Move `src/plugins/comp-logging.h` -> `src/logging/comp-logging.h`

[babeltrace.git] / src / plugins / ctf / common / msg-iter / msg-iter.c

diff --git a/src/plugins/ctf/common/msg-iter/msg-iter.c b/src/plugins/ctf/common/msg-iter/msg-iter.c
index 27d51779251e049a5c90d3f27035d5ff97f9df80..78a65f1adb631c1cfef61f3c79feca79b1dc5436 100644 (file)
--- a/src/plugins/ctf/common/msg-iter/msg-iter.c
+++ b/src/plugins/ctf/common/msg-iter/msg-iter.c
@@ -26,7 +26,7 @@
 #define BT_COMP_LOG_SELF_COMP (notit->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (notit->log_level)
 #define BT_LOG_TAG "PLUGIN/CTF/MSG-ITER"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdint.h>
 #include <inttypes.h>
@@ -258,57 +258,57 @@ const char *state_string(enum state state)
 {
        switch (state) {
        case STATE_INIT:
-               return "STATE_INIT";
+               return "INIT";
        case STATE_DSCOPE_TRACE_PACKET_HEADER_BEGIN:
-               return "STATE_DSCOPE_TRACE_PACKET_HEADER_BEGIN";
+               return "DSCOPE_TRACE_PACKET_HEADER_BEGIN";
        case STATE_DSCOPE_TRACE_PACKET_HEADER_CONTINUE:
-               return "STATE_DSCOPE_TRACE_PACKET_HEADER_CONTINUE";
+               return "DSCOPE_TRACE_PACKET_HEADER_CONTINUE";
        case STATE_AFTER_TRACE_PACKET_HEADER:
-               return "STATE_AFTER_TRACE_PACKET_HEADER";
+               return "AFTER_TRACE_PACKET_HEADER";
        case STATE_DSCOPE_STREAM_PACKET_CONTEXT_BEGIN:
-               return "STATE_DSCOPE_STREAM_PACKET_CONTEXT_BEGIN";
+               return "DSCOPE_STREAM_PACKET_CONTEXT_BEGIN";
        case STATE_DSCOPE_STREAM_PACKET_CONTEXT_CONTINUE:
-               return "STATE_DSCOPE_STREAM_PACKET_CONTEXT_CONTINUE";
+               return "DSCOPE_STREAM_PACKET_CONTEXT_CONTINUE";
        case STATE_AFTER_STREAM_PACKET_CONTEXT:
-               return "STATE_AFTER_STREAM_PACKET_CONTEXT";
+               return "AFTER_STREAM_PACKET_CONTEXT";
        case STATE_EMIT_MSG_STREAM_BEGINNING:
-               return "STATE_EMIT_MSG_STREAM_BEGINNING";
+               return "EMIT_MSG_STREAM_BEGINNING";
        case STATE_EMIT_MSG_PACKET_BEGINNING:
-               return "STATE_EMIT_MSG_PACKET_BEGINNING";
+               return "EMIT_MSG_PACKET_BEGINNING";
        case STATE_EMIT_MSG_DISCARDED_EVENTS:
-               return "STATE_EMIT_MSG_DISCARDED_EVENTS";
+               return "EMIT_MSG_DISCARDED_EVENTS";
        case STATE_EMIT_MSG_DISCARDED_PACKETS:
-               return "STATE_EMIT_MSG_DISCARDED_PACKETS";
+               return "EMIT_MSG_DISCARDED_PACKETS";
        case STATE_DSCOPE_EVENT_HEADER_BEGIN:
-               return "STATE_DSCOPE_EVENT_HEADER_BEGIN";
+               return "DSCOPE_EVENT_HEADER_BEGIN";
        case STATE_DSCOPE_EVENT_HEADER_CONTINUE:
-               return "STATE_DSCOPE_EVENT_HEADER_CONTINUE";
+               return "DSCOPE_EVENT_HEADER_CONTINUE";
        case STATE_AFTER_EVENT_HEADER:
-               return "STATE_AFTER_EVENT_HEADER";
+               return "AFTER_EVENT_HEADER";
        case STATE_DSCOPE_EVENT_COMMON_CONTEXT_BEGIN:
-               return "STATE_DSCOPE_EVENT_COMMON_CONTEXT_BEGIN";
+               return "DSCOPE_EVENT_COMMON_CONTEXT_BEGIN";
        case STATE_DSCOPE_EVENT_COMMON_CONTEXT_CONTINUE:
-               return "STATE_DSCOPE_EVENT_COMMON_CONTEXT_CONTINUE";
+               return "DSCOPE_EVENT_COMMON_CONTEXT_CONTINUE";
        case STATE_DSCOPE_EVENT_SPEC_CONTEXT_BEGIN:
-               return "STATE_DSCOPE_EVENT_SPEC_CONTEXT_BEGIN";
+               return "DSCOPE_EVENT_SPEC_CONTEXT_BEGIN";
        case STATE_DSCOPE_EVENT_SPEC_CONTEXT_CONTINUE:
-               return "STATE_DSCOPE_EVENT_SPEC_CONTEXT_CONTINUE";
+               return "DSCOPE_EVENT_SPEC_CONTEXT_CONTINUE";
        case STATE_DSCOPE_EVENT_PAYLOAD_BEGIN:
-               return "STATE_DSCOPE_EVENT_PAYLOAD_BEGIN";
+               return "DSCOPE_EVENT_PAYLOAD_BEGIN";
        case STATE_DSCOPE_EVENT_PAYLOAD_CONTINUE:
-               return "STATE_DSCOPE_EVENT_PAYLOAD_CONTINUE";
+               return "DSCOPE_EVENT_PAYLOAD_CONTINUE";
        case STATE_EMIT_MSG_EVENT:
-               return "STATE_EMIT_MSG_EVENT";
+               return "EMIT_MSG_EVENT";
        case STATE_SKIP_PACKET_PADDING:
-               return "STATE_SKIP_PACKET_PADDING";
+               return "SKIP_PACKET_PADDING";
        case STATE_EMIT_MSG_PACKET_END_MULTI:
-               return "STATE_EMIT_MSG_PACKET_END_MULTI";
+               return "EMIT_MSG_PACKET_END_MULTI";
        case STATE_EMIT_MSG_PACKET_END_SINGLE:
-               return "STATE_EMIT_MSG_PACKET_END_SINGLE";
+               return "EMIT_MSG_PACKET_END_SINGLE";
        case STATE_EMIT_MSG_STREAM_END:
-               return "STATE_EMIT_MSG_STREAM_END";
+               return "EMIT_MSG_STREAM_END";
        case STATE_DONE:
-               return "STATE_DONE";
+               return "DONE";
        default:
                return "(unknown)";
        }
@@ -1835,7 +1835,9 @@ bt_field *borrow_next_field(struct bt_msg_iter *notit)
                next_field = bt_field_array_borrow_element_field_by_index(
                        base_field, index);
                break;
-       case BT_FIELD_CLASS_TYPE_VARIANT:
+       case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR:
+       case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR:
+       case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR:
                BT_ASSERT(index == 0);
                next_field = bt_field_variant_borrow_selected_option_field(
                        base_field);
@@ -1970,7 +1972,7 @@ update_def_clock:
                  BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER ||
                  bt_field_get_class_type(field) ==
                  BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION);
-       bt_field_unsigned_integer_set_value(field, value);
+       bt_field_integer_unsigned_set_value(field, value);
        stack_top(notit->stack)->index++;
 
 end:
@@ -2059,7 +2061,7 @@ enum bt_bfcr_status bfcr_signed_int_cb(int64_t value,
                  BT_FIELD_CLASS_TYPE_SIGNED_INTEGER ||
                  bt_field_get_class_type(field) ==
                  BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION);
-       bt_field_signed_integer_set_value(field, value);
+       bt_field_integer_signed_set_value(field, value);
        stack_top(notit->stack)->index++;
 
 end:
@@ -2311,7 +2313,7 @@ int64_t bfcr_get_sequence_length_cb(struct ctf_field_class *fc, void *data)
        if (!seq_fc->base.is_text) {
                BT_ASSERT(bt_field_get_class_type(seq_field) ==
                        BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY);
-               ret = bt_field_dynamic_array_set_length(seq_field,
+               ret = bt_field_array_dynamic_set_length(seq_field,
                        (uint64_t) length);
                if (ret) {
                        BT_COMP_LOGE("Cannot set dynamic array field's length field: "
@@ -2385,7 +2387,7 @@ struct ctf_field_class *bfcr_borrow_variant_selected_field_class_cb(
        if (selected_option->fc->in_ir) {
                bt_field *var_field = stack_top(notit->stack)->base;
 
-               ret = bt_field_variant_select_option_field(
+               ret = bt_field_variant_select_option_field_by_index(
                        var_field, option_index);
                if (ret) {
                        BT_COMP_LOGW("Cannot select variant field's option field: "