projects / babeltrace.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
*_string() enumerator to string functions: remove common prefix
[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 fe1d160d1cbe660ffd9b6582ed530cada8092b1b..f7d474995084c227647c14cc5c825b687a926c3e 100644 (file)
--- a/src/plugins/ctf/common/msg-iter/msg-iter.c
+++ b/src/plugins/ctf/common/msg-iter/msg-iter.c
@@ -88,7 +88,6 @@ enum state {
        STATE_AFTER_STREAM_PACKET_CONTEXT,
        STATE_CHECK_EMIT_MSG_STREAM_BEGINNING,
        STATE_EMIT_MSG_STREAM_BEGINNING,
-       STATE_EMIT_MSG_STREAM_ACTIVITY_BEGINNING,
        STATE_CHECK_EMIT_MSG_DISCARDED_EVENTS,
        STATE_CHECK_EMIT_MSG_DISCARDED_PACKETS,
        STATE_EMIT_MSG_DISCARDED_EVENTS,
@@ -107,8 +106,7 @@ enum state {
        STATE_SKIP_PACKET_PADDING,
        STATE_EMIT_MSG_PACKET_END_MULTI,
        STATE_EMIT_MSG_PACKET_END_SINGLE,
-       STATE_CHECK_EMIT_MSG_STREAM_ACTIVITY_END,
-       STATE_EMIT_MSG_STREAM_ACTIVITY_END,
+       STATE_CHECK_EMIT_MSG_STREAM_END,
        STATE_EMIT_MSG_STREAM_END,
        STATE_DONE,
 };
@@ -128,13 +126,10 @@ struct bt_msg_iter {
        /* Current message iterator to create messages (weak) */
        bt_self_message_iterator *msg_iter;
 
-       /*
-        * True to emit stream beginning and stream activity beginning
-        * messages.
-        */
+       /* True to emit a stream beginning message. */
        bool emit_stream_begin_msg;
 
-       /* True to emit stream end and stream activity end messages */
+       /* True to emit a stream end message. */
        bool emit_stream_end_msg;
 
        /* True to set the stream */
@@ -263,61 +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";
-       case STATE_EMIT_MSG_STREAM_ACTIVITY_BEGINNING:
-               return "STATE_EMIT_MSG_STREAM_ACTIVITY_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";
-       case STATE_EMIT_MSG_STREAM_ACTIVITY_END:
-               return "STATE_EMIT_MSG_STREAM_ACTIVITY_END";
+               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)";
        }
@@ -710,7 +701,7 @@ enum bt_msg_iter_status read_packet_header_begin_state(
                break;
        case BT_MSG_ITER_STATUS_EOF:
                ret = BT_MSG_ITER_STATUS_OK;
-               notit->state = STATE_CHECK_EMIT_MSG_STREAM_ACTIVITY_END;
+               notit->state = STATE_CHECK_EMIT_MSG_STREAM_END;
                goto end;
        default:
                goto end;
@@ -1206,11 +1197,11 @@ enum bt_msg_iter_status set_current_event_message(
        BT_ASSERT(notit->meta.sc);
 
        if (bt_stream_class_borrow_default_clock_class(notit->meta.sc->ir_sc)) {
-               msg = bt_message_event_create_with_default_clock_snapshot(
+               msg = bt_message_event_create_with_packet_and_default_clock_snapshot(
                        notit->msg_iter, notit->meta.ec->ir_ec,
                        notit->packet, notit->default_clock_snapshot);
        } else {
-               msg = bt_message_event_create(notit->msg_iter,
+               msg = bt_message_event_create_with_packet(notit->msg_iter,
                        notit->meta.ec->ir_ec, notit->packet);
        }
 
@@ -1570,11 +1561,11 @@ end:
 }
 
 static
-enum bt_msg_iter_status check_emit_msg_stream_activity_end(
+enum bt_msg_iter_status check_emit_msg_stream_end(
                struct bt_msg_iter *notit)
 {
        if (notit->emit_stream_end_msg) {
-               notit->state = STATE_EMIT_MSG_STREAM_ACTIVITY_END;
+               notit->state = STATE_EMIT_MSG_STREAM_END;
        } else {
                notit->state = STATE_DONE;
        }
@@ -1618,9 +1609,6 @@ enum bt_msg_iter_status handle_state(struct bt_msg_iter *notit)
                status = check_emit_msg_stream_beginning_state(notit);
                break;
        case STATE_EMIT_MSG_STREAM_BEGINNING:
-               notit->state = STATE_EMIT_MSG_STREAM_ACTIVITY_BEGINNING;
-               break;
-       case STATE_EMIT_MSG_STREAM_ACTIVITY_BEGINNING:
                notit->state = STATE_CHECK_EMIT_MSG_DISCARDED_EVENTS;
                break;
        case STATE_CHECK_EMIT_MSG_DISCARDED_EVENTS:
@@ -1675,13 +1663,10 @@ enum bt_msg_iter_status handle_state(struct bt_msg_iter *notit)
                notit->state = STATE_SKIP_PACKET_PADDING;
                break;
        case STATE_EMIT_MSG_PACKET_END_SINGLE:
-               notit->state = STATE_CHECK_EMIT_MSG_STREAM_ACTIVITY_END;
+               notit->state = STATE_CHECK_EMIT_MSG_STREAM_END;
                break;
-       case STATE_CHECK_EMIT_MSG_STREAM_ACTIVITY_END:
-               status = check_emit_msg_stream_activity_end(notit);
-               break;
-       case STATE_EMIT_MSG_STREAM_ACTIVITY_END:
-               notit->state = STATE_EMIT_MSG_STREAM_END;
+       case STATE_CHECK_EMIT_MSG_STREAM_END:
+               status = check_emit_msg_stream_end(notit);
                break;
        case STATE_EMIT_MSG_STREAM_END:
                notit->state = STATE_DONE;
@@ -1850,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);
@@ -1985,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:
@@ -2074,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:
@@ -2326,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: "
@@ -2400,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: "
@@ -2437,52 +2424,6 @@ void create_msg_stream_beginning(struct bt_msg_iter *notit,
        *message = ret;
 }
 
-static
-void create_msg_stream_activity_beginning(struct bt_msg_iter *notit,
-               bt_message **message)
-{
-       bt_message *ret = NULL;
-
-       BT_ASSERT(notit->stream);
-       BT_ASSERT(notit->msg_iter);
-       ret = bt_message_stream_activity_beginning_create(notit->msg_iter,
-               notit->stream);
-       if (!ret) {
-               BT_COMP_LOGE("Cannot create stream activity beginning message: "
-                       "notit-addr=%p, stream-addr=%p",
-                       notit, notit->stream);
-               return;
-       }
-
-       *message = ret;
-}
-
-static
-void create_msg_stream_activity_end(struct bt_msg_iter *notit,
-               bt_message **message)
-{
-       bt_message *ret = NULL;
-
-       if (!notit->stream) {
-               BT_COMP_LOGE("Cannot create stream for stream message: "
-                       "notit-addr=%p", notit);
-               return;
-       }
-
-       BT_ASSERT(notit->stream);
-       BT_ASSERT(notit->msg_iter);
-       ret = bt_message_stream_activity_end_create(notit->msg_iter,
-               notit->stream);
-       if (!ret) {
-               BT_COMP_LOGE("Cannot create stream activity end message: "
-                       "notit-addr=%p, stream-addr=%p",
-                       notit, notit->stream);
-               return;
-       }
-
-       *message = ret;
-}
-
 static
 void create_msg_stream_end(struct bt_msg_iter *notit, bt_message **message)
 {
@@ -2862,24 +2803,6 @@ enum bt_msg_iter_status bt_msg_iter_get_next_message(
                                status = BT_MSG_ITER_STATUS_ERROR;
                        }
 
-                       goto end;
-               case STATE_EMIT_MSG_STREAM_ACTIVITY_BEGINNING:
-                       /* create_msg_stream_activity_beginning() logs errors */
-                       create_msg_stream_activity_beginning(notit, message);
-
-                       if (!*message) {
-                               status = BT_MSG_ITER_STATUS_ERROR;
-                       }
-
-                       goto end;
-               case STATE_EMIT_MSG_STREAM_ACTIVITY_END:
-                       /* create_msg_stream_activity_end() logs errors */
-                       create_msg_stream_activity_end(notit, message);
-
-                       if (!*message) {
-                               status = BT_MSG_ITER_STATUS_ERROR;
-                       }
-
                        goto end;
                case STATE_EMIT_MSG_STREAM_BEGINNING:
                        /* create_msg_stream_beginning() logs errors */
@@ -2954,7 +2877,6 @@ enum bt_msg_iter_status read_packet_header_context_fields(
                case STATE_AFTER_STREAM_PACKET_CONTEXT:
                case STATE_CHECK_EMIT_MSG_STREAM_BEGINNING:
                case STATE_EMIT_MSG_STREAM_BEGINNING:
-               case STATE_EMIT_MSG_STREAM_ACTIVITY_BEGINNING:
                case STATE_CHECK_EMIT_MSG_DISCARDED_EVENTS:
                case STATE_EMIT_MSG_DISCARDED_EVENTS:
                case STATE_CHECK_EMIT_MSG_DISCARDED_PACKETS:
BabelTrace - Trace Format Babel Tower
This page took 0.027877 seconds and 4 git commands to generate.