From 8a4328893c7222e490da887e1caec4e61fe3d56e Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Wed, 24 Jul 2019 17:57:01 -0400 Subject: [PATCH] *_string() enumerator to string functions: remove common prefix Those functions are used for logging and error cause messages. Removing this prefix makes the output less noisy. The logging statement typically indicates what field is logged anyway, for example: Destroying event message: addr=0x4f6c580, type=EVENT Destroying port: addr=0x4f30c20, type=INPUT Destroying structure field class object: addr=0x4eb2e30, type=STRUCTURE Finalizing error cause: addr=0x4daa6f0, actor-type=UNKNOWN Signed-off-by: Philippe Proulx Change-Id: Ieb0bda9287bafbd06e2aa0f077d5d631213e5803 Reviewed-on: https://review.lttng.org/c/babeltrace/+/1780 Tested-by: jenkins --- src/common/common.h | 100 ++++++++++----------- src/lib/error.h | 8 +- src/lib/graph/component-class.h | 6 +- src/lib/graph/graph.h | 10 ++- src/lib/graph/message/iterator.h | 14 +-- src/lib/graph/message/message.h | 14 +-- src/lib/graph/message/stream.h | 4 +- src/lib/graph/port.h | 4 +- src/lib/plugin/plugin.h | 4 +- src/lib/trace-ir/field-path.h | 4 +- src/plugins/ctf/common/bfcr/bfcr.c | 12 +-- src/plugins/ctf/common/bfcr/bfcr.h | 10 +-- src/plugins/ctf/common/metadata/ctf-meta.h | 12 +-- src/plugins/ctf/common/msg-iter/msg-iter.c | 52 +++++------ src/plugins/ctf/common/msg-iter/msg-iter.h | 20 ++--- 15 files changed, 139 insertions(+), 135 deletions(-) diff --git a/src/common/common.h b/src/common/common.h index e2bd1bc9..88de75e6 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -408,29 +408,29 @@ const char *bt_common_field_class_type_string(enum bt_field_class_type class_typ { switch (class_type) { case BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER: - return "BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER"; + return "UNSIGNED_INTEGER"; case BT_FIELD_CLASS_TYPE_SIGNED_INTEGER: - return "BT_FIELD_CLASS_TYPE_SIGNED_INTEGER"; + return "SIGNED_INTEGER"; case BT_FIELD_CLASS_TYPE_REAL: - return "BT_FIELD_CLASS_TYPE_REAL"; + return "REAL"; case BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION: - return "BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION"; + return "UNSIGNED_ENUMERATION"; case BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION: - return "BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION"; + return "SIGNED_ENUMERATION"; case BT_FIELD_CLASS_TYPE_STRING: - return "BT_FIELD_CLASS_TYPE_STRING"; + return "STRING"; case BT_FIELD_CLASS_TYPE_STRUCTURE: - return "BT_FIELD_CLASS_TYPE_STRUCTURE"; + return "STRUCTURE"; case BT_FIELD_CLASS_TYPE_STATIC_ARRAY: - return "BT_FIELD_CLASS_TYPE_STATIC_ARRAY"; + return "STATIC_ARRAY"; case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY: - return "BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY"; + return "DYNAMIC_ARRAY"; case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR: - return "BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR"; + return "VARIANT_WITHOUT_SELECTOR"; case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR: - return "BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR"; + return "VARIANT_WITH_UNSIGNED_SELECTOR"; case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR: - return "BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR"; + return "VARIANT_WITH_SIGNED_SELECTOR"; default: return "(unknown)"; } @@ -441,13 +441,13 @@ const char *bt_common_field_class_integer_preferred_display_base_string(enum bt_ { switch (base) { case BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_BINARY: - return "BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_BINARY"; + return "BINARY"; case BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_OCTAL: - return "BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_OCTAL"; + return "OCTAL"; case BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_DECIMAL: - return "BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_DECIMAL"; + return "DECIMAL"; case BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_HEXADECIMAL: - return "BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_HEXADECIMAL"; + return "HEXADECIMAL"; default: return "(unknown)"; } @@ -458,13 +458,13 @@ const char *bt_common_scope_string(enum bt_field_path_scope scope) { switch (scope) { case BT_FIELD_PATH_SCOPE_PACKET_CONTEXT: - return "BT_FIELD_PATH_SCOPE_PACKET_CONTEXT"; + return "PACKET_CONTEXT"; case BT_FIELD_PATH_SCOPE_EVENT_COMMON_CONTEXT: - return "BT_FIELD_PATH_SCOPE_EVENT_COMMON_CONTEXT"; + return "EVENT_COMMON_CONTEXT"; case BT_FIELD_PATH_SCOPE_EVENT_SPECIFIC_CONTEXT: - return "BT_FIELD_PATH_SCOPE_EVENT_SPECIFIC_CONTEXT"; + return "EVENT_SPECIFIC_CONTEXT"; case BT_FIELD_PATH_SCOPE_EVENT_PAYLOAD: - return "BT_FIELD_PATH_SCOPE_EVENT_PAYLOAD"; + return "EVENT_PAYLOAD"; default: return "(unknown)"; } @@ -476,35 +476,35 @@ const char *bt_common_event_class_log_level_string( { switch (level) { case BT_EVENT_CLASS_LOG_LEVEL_EMERGENCY: - return "BT_EVENT_CLASS_LOG_LEVEL_EMERGENCY"; + return "EMERGENCY"; case BT_EVENT_CLASS_LOG_LEVEL_ALERT: - return "BT_EVENT_CLASS_LOG_LEVEL_ALERT"; + return "ALERT"; case BT_EVENT_CLASS_LOG_LEVEL_CRITICAL: - return "BT_EVENT_CLASS_LOG_LEVEL_CRITICAL"; + return "CRITICAL"; case BT_EVENT_CLASS_LOG_LEVEL_ERROR: - return "BT_EVENT_CLASS_LOG_LEVEL_ERROR"; + return "ERROR"; case BT_EVENT_CLASS_LOG_LEVEL_WARNING: - return "BT_EVENT_CLASS_LOG_LEVEL_WARNING"; + return "WARNING"; case BT_EVENT_CLASS_LOG_LEVEL_NOTICE: - return "BT_EVENT_CLASS_LOG_LEVEL_NOTICE"; + return "NOTICE"; case BT_EVENT_CLASS_LOG_LEVEL_INFO: - return "BT_EVENT_CLASS_LOG_LEVEL_INFO"; + return "INFO"; case BT_EVENT_CLASS_LOG_LEVEL_DEBUG_SYSTEM: - return "BT_EVENT_CLASS_LOG_LEVEL_DEBUG_SYSTEM"; + return "DEBUG_SYSTEM"; case BT_EVENT_CLASS_LOG_LEVEL_DEBUG_PROGRAM: - return "BT_EVENT_CLASS_LOG_LEVEL_DEBUG_PROGRAM"; + return "DEBUG_PROGRAM"; case BT_EVENT_CLASS_LOG_LEVEL_DEBUG_PROCESS: - return "BT_EVENT_CLASS_LOG_LEVEL_DEBUG_PROCESS"; + return "DEBUG_PROCESS"; case BT_EVENT_CLASS_LOG_LEVEL_DEBUG_MODULE: - return "BT_EVENT_CLASS_LOG_LEVEL_DEBUG_MODULE"; + return "DEBUG_MODULE"; case BT_EVENT_CLASS_LOG_LEVEL_DEBUG_UNIT: - return "BT_EVENT_CLASS_LOG_LEVEL_DEBUG_UNIT"; + return "DEBUG_UNIT"; case BT_EVENT_CLASS_LOG_LEVEL_DEBUG_FUNCTION: - return "BT_EVENT_CLASS_LOG_LEVEL_DEBUG_FUNCTION"; + return "DEBUG_FUNCTION"; case BT_EVENT_CLASS_LOG_LEVEL_DEBUG_LINE: - return "BT_EVENT_CLASS_LOG_LEVEL_DEBUG_LINE"; + return "DEBUG_LINE"; case BT_EVENT_CLASS_LOG_LEVEL_DEBUG: - return "BT_EVENT_CLASS_LOG_LEVEL_DEBUG"; + return "DEBUG"; default: return "(unknown)"; } @@ -515,21 +515,21 @@ const char *bt_common_value_type_string(enum bt_value_type type) { switch (type) { case BT_VALUE_TYPE_NULL: - return "BT_VALUE_TYPE_NULL"; + return "NULL"; case BT_VALUE_TYPE_BOOL: - return "BT_VALUE_TYPE_BOOL"; + return "BOOL"; case BT_VALUE_TYPE_UNSIGNED_INTEGER: - return "BT_VALUE_TYPE_UNSIGNED_INTEGER"; + return "UNSIGNED_INTEGER"; case BT_VALUE_TYPE_SIGNED_INTEGER: - return "BT_VALUE_TYPE_SIGNED_INTEGER"; + return "SIGNED_INTEGER"; case BT_VALUE_TYPE_REAL: - return "BT_VALUE_TYPE_REAL"; + return "REAL"; case BT_VALUE_TYPE_STRING: - return "BT_VALUE_TYPE_STRING"; + return "STRING"; case BT_VALUE_TYPE_ARRAY: - return "BT_VALUE_TYPE_ARRAY"; + return "ARRAY"; case BT_VALUE_TYPE_MAP: - return "BT_VALUE_TYPE_MAP"; + return "MAP"; default: return "(unknown)"; } @@ -579,19 +579,19 @@ const char *bt_common_logging_level_string( { switch (level) { case BT_LOGGING_LEVEL_TRACE: - return "BT_LOGGING_LEVEL_TRACE"; + return "TRACE"; case BT_LOGGING_LEVEL_DEBUG: - return "BT_LOGGING_LEVEL_DEBUG"; + return "DEBUG"; case BT_LOGGING_LEVEL_INFO: - return "BT_LOGGING_LEVEL_INFO"; + return "INFO"; case BT_LOGGING_LEVEL_WARNING: - return "BT_LOGGING_LEVEL_WARNING"; + return "WARNING"; case BT_LOGGING_LEVEL_ERROR: - return "BT_LOGGING_LEVEL_ERROR"; + return "ERROR"; case BT_LOGGING_LEVEL_FATAL: - return "BT_LOGGING_LEVEL_FATAL"; + return "FATAL"; case BT_LOGGING_LEVEL_NONE: - return "BT_LOGGING_LEVEL_NONE"; + return "NONE"; default: return "(unknown)"; } diff --git a/src/lib/error.h b/src/lib/error.h index d2895cbf..78f9c532 100644 --- a/src/lib/error.h +++ b/src/lib/error.h @@ -75,13 +75,13 @@ const char *bt_error_cause_actor_type_string( { switch (actor_type) { case BT_ERROR_CAUSE_ACTOR_TYPE_UNKNOWN: - return "BT_ERROR_CAUSE_ACTOR_TYPE_UNKNOWN"; + return "UNKNOWN"; case BT_ERROR_CAUSE_ACTOR_TYPE_COMPONENT: - return "BT_ERROR_CAUSE_ACTOR_TYPE_COMPONENT"; + return "COMPONENT"; case BT_ERROR_CAUSE_ACTOR_TYPE_COMPONENT_CLASS: - return "BT_ERROR_CAUSE_ACTOR_TYPE_COMPONENT_CLASS"; + return "COMPONENT_CLASS"; case BT_ERROR_CAUSE_ACTOR_TYPE_MESSAGE_ITERATOR: - return "BT_ERROR_CAUSE_ACTOR_TYPE_MESSAGE_ITERATOR"; + return "MESSAGE_ITERATOR"; default: return "(unknown)"; } diff --git a/src/lib/graph/component-class.h b/src/lib/graph/component-class.h index c6757ed3..838acbce 100644 --- a/src/lib/graph/component-class.h +++ b/src/lib/graph/component-class.h @@ -129,11 +129,11 @@ const char *bt_component_class_type_string(enum bt_component_class_type type) { switch (type) { case BT_COMPONENT_CLASS_TYPE_SOURCE: - return "BT_COMPONENT_CLASS_TYPE_SOURCE"; + return "SOURCE"; case BT_COMPONENT_CLASS_TYPE_SINK: - return "BT_COMPONENT_CLASS_TYPE_SINK"; + return "SINK"; case BT_COMPONENT_CLASS_TYPE_FILTER: - return "BT_COMPONENT_CLASS_TYPE_FILTER"; + return "FILTER"; default: return "(unknown)"; } diff --git a/src/lib/graph/graph.h b/src/lib/graph/graph.h index 4e500d49..2f189f83 100644 --- a/src/lib/graph/graph.h +++ b/src/lib/graph/graph.h @@ -206,11 +206,15 @@ const char *bt_graph_configuration_state_string( { switch (state) { case BT_GRAPH_CONFIGURATION_STATE_CONFIGURING: - return "BT_GRAPH_CONFIGURATION_STATE_CONFIGURING"; + return "CONFIGURING"; case BT_GRAPH_CONFIGURATION_STATE_PARTIALLY_CONFIGURED: - return "BT_GRAPH_CONFIGURATION_STATE_PARTIALLY_CONFIGURED"; + return "PARTIALLY_CONFIGURED"; case BT_GRAPH_CONFIGURATION_STATE_CONFIGURED: - return "BT_GRAPH_CONFIGURATION_STATE_CONFIGURED"; + return "CONFIGURED"; + case BT_GRAPH_CONFIGURATION_STATE_FAULTY: + return "FAULTY"; + case BT_GRAPH_CONFIGURATION_STATE_DESTROYING: + return "DESTROYING"; default: return "(unknown)"; } diff --git a/src/lib/graph/message/iterator.h b/src/lib/graph/message/iterator.h index 93d9aa23..f48872ec 100644 --- a/src/lib/graph/message/iterator.h +++ b/src/lib/graph/message/iterator.h @@ -226,19 +226,19 @@ const char *bt_self_component_port_input_message_iterator_state_string( { switch (state) { case BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ACTIVE: - return "BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ACTIVE"; + return "ACTIVE"; case BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ENDED: - return "BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ENDED"; + return "ENDED"; case BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_FINALIZING: - return "BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_FINALIZING"; + return "FINALIZING"; case BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_FINALIZED: - return "BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_FINALIZED"; + return "FINALIZED"; case BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_SEEKING: - return "BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_SEEKING"; + return "SEEKING"; case BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_AGAIN: - return "BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_AGAIN"; + return "LAST_SEEKING_RETURNED_AGAIN"; case BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_ERROR: - return "BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_ERROR"; + return "LAST_SEEKING_RETURNED_ERROR"; default: return "(unknown)"; } diff --git a/src/lib/graph/message/message.h b/src/lib/graph/message/message.h index 75515ef8..4c997164 100644 --- a/src/lib/graph/message/message.h +++ b/src/lib/graph/message/message.h @@ -134,19 +134,19 @@ const char *bt_message_type_string(enum bt_message_type type) { switch (type) { case BT_MESSAGE_TYPE_EVENT: - return "BT_MESSAGE_TYPE_EVENT"; + return "EVENT"; case BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY: - return "BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY"; + return "MESSAGE_ITERATOR_INACTIVITY"; case BT_MESSAGE_TYPE_STREAM_BEGINNING: - return "BT_MESSAGE_TYPE_STREAM_BEGINNING"; + return "STREAM_BEGINNING"; case BT_MESSAGE_TYPE_STREAM_END: - return "BT_MESSAGE_TYPE_STREAM_END"; + return "STREAM_END"; case BT_MESSAGE_TYPE_PACKET_BEGINNING: - return "BT_MESSAGE_TYPE_PACKET_BEGINNING"; + return "PACKET_BEGINNING"; case BT_MESSAGE_TYPE_PACKET_END: - return "BT_MESSAGE_TYPE_PACKET_END"; + return "PACKET_END"; case BT_MESSAGE_TYPE_DISCARDED_EVENTS: - return "BT_MESSAGE_TYPE_DISCARDED_EVENTS"; + return "DISCARDED_EVENTS"; default: return "(unknown)"; } diff --git a/src/lib/graph/message/stream.h b/src/lib/graph/message/stream.h index 4de74c5e..ed5d2816 100644 --- a/src/lib/graph/message/stream.h +++ b/src/lib/graph/message/stream.h @@ -46,9 +46,9 @@ const char *bt_message_stream_clock_snapshot_state_string( { switch (state) { case BT_MESSAGE_STREAM_CLOCK_SNAPSHOT_STATE_KNOWN: - return "BT_MESSAGE_STREAM_ACTIVITY_CLOCK_SNAPSHOT_STATE_KNOWN"; + return "KNOWN"; case BT_MESSAGE_STREAM_CLOCK_SNAPSHOT_STATE_UNKNOWN: - return "BT_MESSAGE_STREAM_ACTIVITY_CLOCK_SNAPSHOT_STATE_UNKNOWN"; + return "UNKNOWN"; default: return "(unknown)"; } diff --git a/src/lib/graph/port.h b/src/lib/graph/port.h index a10fb7fa..fe9a64ef 100644 --- a/src/lib/graph/port.h +++ b/src/lib/graph/port.h @@ -57,9 +57,9 @@ const char *bt_port_type_string(enum bt_port_type port_type) { switch (port_type) { case BT_PORT_TYPE_INPUT: - return "BT_PORT_TYPE_INPUT"; + return "INPUT"; case BT_PORT_TYPE_OUTPUT: - return "BT_PORT_TYPE_OUTPUT"; + return "OUTPUT"; default: return "(unknown)"; } diff --git a/src/lib/plugin/plugin.h b/src/lib/plugin/plugin.h index ba4f4551..7741ba50 100644 --- a/src/lib/plugin/plugin.h +++ b/src/lib/plugin/plugin.h @@ -93,9 +93,9 @@ const char *bt_plugin_type_string(enum bt_plugin_type type) { switch (type) { case BT_PLUGIN_TYPE_SO: - return "BT_PLUGIN_TYPE_SO"; + return "SO"; case BT_PLUGIN_TYPE_PYTHON: - return "BT_PLUGIN_TYPE_PYTHON"; + return "PYTHON"; default: return "(unknown)"; } diff --git a/src/lib/trace-ir/field-path.h b/src/lib/trace-ir/field-path.h index 834f7f0f..df293162 100644 --- a/src/lib/trace-ir/field-path.h +++ b/src/lib/trace-ir/field-path.h @@ -80,9 +80,9 @@ const char *bt_field_path_item_type_string(enum bt_field_path_item_type type) { switch (type) { case BT_FIELD_PATH_ITEM_TYPE_INDEX: - return "BT_FIELD_PATH_ITEM_TYPE_INDEX"; + return "INDEX"; case BT_FIELD_PATH_ITEM_TYPE_CURRENT_ARRAY_ELEMENT: - return "BT_FIELD_PATH_ITEM_TYPE_CURRENT_ARRAY_ELEMENT"; + return "CURRENT_ARRAY_ELEMENT"; default: return "(unknown)"; } diff --git a/src/plugins/ctf/common/bfcr/bfcr.c b/src/plugins/ctf/common/bfcr/bfcr.c index 100794e8..4aedabc5 100644 --- a/src/plugins/ctf/common/bfcr/bfcr.c +++ b/src/plugins/ctf/common/bfcr/bfcr.c @@ -172,17 +172,17 @@ const char *bfcr_state_string(enum bfcr_state state) { switch (state) { case BFCR_STATE_NEXT_FIELD: - return "BFCR_STATE_NEXT_FIELD"; + return "NEXT_FIELD"; case BFCR_STATE_ALIGN_BASIC: - return "BFCR_STATE_ALIGN_BASIC"; + return "ALIGN_BASIC"; case BFCR_STATE_ALIGN_COMPOUND: - return "BFCR_STATE_ALIGN_COMPOUND"; + return "ALIGN_COMPOUND"; case BFCR_STATE_READ_BASIC_BEGIN: - return "BFCR_STATE_READ_BASIC_BEGIN"; + return "READ_BASIC_BEGIN"; case BFCR_STATE_READ_BASIC_CONTINUE: - return "BFCR_STATE_READ_BASIC_CONTINUE"; + return "READ_BASIC_CONTINUE"; case BFCR_STATE_DONE: - return "BFCR_STATE_DONE"; + return "DONE"; default: return "(unknown)"; } diff --git a/src/plugins/ctf/common/bfcr/bfcr.h b/src/plugins/ctf/common/bfcr/bfcr.h index edf3de15..ec07f0e3 100644 --- a/src/plugins/ctf/common/bfcr/bfcr.h +++ b/src/plugins/ctf/common/bfcr/bfcr.h @@ -362,15 +362,15 @@ const char *bt_bfcr_status_string(enum bt_bfcr_status status) { switch (status) { case BT_BFCR_STATUS_ENOMEM: - return "BT_BFCR_STATUS_ENOMEM"; + return "ENOMEM"; case BT_BFCR_STATUS_EOF: - return "BT_BFCR_STATUS_EOF"; + return "EOF"; case BT_BFCR_STATUS_INVAL: - return "BT_BFCR_STATUS_INVAL"; + return "INVAL"; case BT_BFCR_STATUS_ERROR: - return "BT_BFCR_STATUS_ERROR"; + return "ERROR"; case BT_BFCR_STATUS_OK: - return "BT_BFCR_STATUS_OK"; + return "OK"; default: return "(unknown)"; } diff --git a/src/plugins/ctf/common/metadata/ctf-meta.h b/src/plugins/ctf/common/metadata/ctf-meta.h index 45d49d16..68ad988e 100644 --- a/src/plugins/ctf/common/metadata/ctf-meta.h +++ b/src/plugins/ctf/common/metadata/ctf-meta.h @@ -1130,17 +1130,17 @@ const char *ctf_scope_string(enum ctf_scope scope) { switch (scope) { case CTF_SCOPE_PACKET_HEADER: - return "CTF_SCOPE_PACKET_HEADER"; + return "PACKET_HEADER"; case CTF_SCOPE_PACKET_CONTEXT: - return "CTF_SCOPE_PACKET_CONTEXT"; + return "PACKET_CONTEXT"; case CTF_SCOPE_EVENT_HEADER: - return "CTF_SCOPE_EVENT_HEADER"; + return "EVENT_HEADER"; case CTF_SCOPE_EVENT_COMMON_CONTEXT: - return "CTF_SCOPE_EVENT_COMMON_CONTEXT"; + return "EVENT_COMMON_CONTEXT"; case CTF_SCOPE_EVENT_SPECIFIC_CONTEXT: - return "CTF_SCOPE_EVENT_SPECIFIC_CONTEXT"; + return "EVENT_SPECIFIC_CONTEXT"; case CTF_SCOPE_EVENT_PAYLOAD: - return "CTF_SCOPE_EVENT_PAYLOAD"; + return "EVENT_PAYLOAD"; default: abort(); } diff --git a/src/plugins/ctf/common/msg-iter/msg-iter.c b/src/plugins/ctf/common/msg-iter/msg-iter.c index 5c681aac..f7d47499 100644 --- a/src/plugins/ctf/common/msg-iter/msg-iter.c +++ b/src/plugins/ctf/common/msg-iter/msg-iter.c @@ -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)"; } diff --git a/src/plugins/ctf/common/msg-iter/msg-iter.h b/src/plugins/ctf/common/msg-iter/msg-iter.h index 8b02b757..b3a129da 100644 --- a/src/plugins/ctf/common/msg-iter/msg-iter.h +++ b/src/plugins/ctf/common/msg-iter/msg-iter.h @@ -346,15 +346,15 @@ const char *bt_msg_iter_medium_status_string( { switch (status) { case BT_MSG_ITER_MEDIUM_STATUS_EOF: - return "BT_MSG_ITER_MEDIUM_STATUS_EOF"; + return "EOF"; case BT_MSG_ITER_MEDIUM_STATUS_AGAIN: - return "BT_MSG_ITER_MEDIUM_STATUS_AGAIN"; + return "AGAIN"; case BT_MSG_ITER_MEDIUM_STATUS_INVAL: - return "BT_MSG_ITER_MEDIUM_STATUS_INVAL"; + return "INVAL"; case BT_MSG_ITER_MEDIUM_STATUS_ERROR: - return "BT_MSG_ITER_MEDIUM_STATUS_ERROR"; + return "ERROR"; case BT_MSG_ITER_MEDIUM_STATUS_OK: - return "BT_MSG_ITER_MEDIUM_STATUS_OK"; + return "OK"; default: return "(unknown)"; } @@ -366,15 +366,15 @@ const char *bt_msg_iter_status_string( { switch (status) { case BT_MSG_ITER_STATUS_EOF: - return "BT_MSG_ITER_STATUS_EOF"; + return "EOF"; case BT_MSG_ITER_STATUS_AGAIN: - return "BT_MSG_ITER_STATUS_AGAIN"; + return "AGAIN"; case BT_MSG_ITER_STATUS_INVAL: - return "BT_MSG_ITER_STATUS_INVAL"; + return "INVAL"; case BT_MSG_ITER_STATUS_ERROR: - return "BT_MSG_ITER_STATUS_ERROR"; + return "ERROR"; case BT_MSG_ITER_STATUS_OK: - return "BT_MSG_ITER_STATUS_OK"; + return "OK"; default: return "(unknown)"; } -- 2.34.1