X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Flttng-utils%2Fdebug-info%2Ftrace-ir-data-copy.c;h=42395904cf8bd8893870eb2783413d29c033ba45;hb=98b15851a941e7342b8bb19e265cdc3a40fabfb8;hp=c106d059f387db5657358d742f34ec565a5335f1;hpb=bc463d346ce2e04bcc39fd1919638d76c68ea9c2;p=babeltrace.git

diff --git a/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c b/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c
index c106d059..42395904 100644
--- a/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c
+++ b/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c
@@ -188,7 +188,7 @@ void copy_event_content(const bt_event *in_event, bt_event *out_event,
 	if (in_common_ctx_field) {
 		out_common_ctx_field =
 			bt_event_borrow_common_context_field(out_event);
-		BT_ASSERT(out_common_ctx_field);
+		BT_ASSERT_DBG(out_common_ctx_field);
 		copy_field_content(in_common_ctx_field,
 			out_common_ctx_field, log_level, self_comp);
 	}
@@ -198,7 +198,7 @@ void copy_event_content(const bt_event *in_event, bt_event *out_event,
 	if (in_specific_ctx_field) {
 		out_specific_ctx_field =
 			bt_event_borrow_specific_context_field(out_event);
-		BT_ASSERT(out_specific_ctx_field);
+		BT_ASSERT_DBG(out_specific_ctx_field);
 		copy_field_content(in_specific_ctx_field,
 			out_specific_ctx_field, log_level, self_comp);
 	}
@@ -206,7 +206,7 @@ void copy_event_content(const bt_event *in_event, bt_event *out_event,
 	in_payload_field = bt_event_borrow_payload_field_const(in_event);
 	if (in_payload_field) {
 		out_payload_field = bt_event_borrow_payload_field(out_event);
-		BT_ASSERT(out_payload_field);
+		BT_ASSERT_DBG(out_payload_field);
 		copy_field_content(in_payload_field,
 			out_payload_field, log_level, self_comp);
 	}
@@ -223,39 +223,32 @@ void copy_field_content(const bt_field *in_field, bt_field *out_field,
 
 	in_fc_type = bt_field_get_class_type(in_field);
 	out_fc_type = bt_field_get_class_type(out_field);
-	BT_ASSERT(in_fc_type == out_fc_type);
+	BT_ASSERT_DBG(in_fc_type == out_fc_type);
 
 	BT_COMP_LOGT("Copying content of field: in-f-addr=%p, out-f-addr=%p",
 			in_field, out_field);
-	switch (in_fc_type) {
-	case BT_FIELD_CLASS_TYPE_BOOL:
+
+	if (in_fc_type == BT_FIELD_CLASS_TYPE_BOOL) {
 		bt_field_bool_set_value(out_field,
 			bt_field_bool_get_value(in_field));
-		break;
-	case BT_FIELD_CLASS_TYPE_BIT_ARRAY:
+	} else if (in_fc_type == BT_FIELD_CLASS_TYPE_BIT_ARRAY) {
 		bt_field_bit_array_set_value_as_integer(out_field,
 			bt_field_bit_array_get_value_as_integer(in_field));
-		break;
-	case BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER:
-	case BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION:
+	} else if (bt_field_class_type_is(in_fc_type,
+			BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER)) {
 		bt_field_integer_unsigned_set_value(out_field,
 				bt_field_integer_unsigned_get_value(in_field));
-		break;
-	case BT_FIELD_CLASS_TYPE_SIGNED_INTEGER:
-	case BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION:
+	} else if (bt_field_class_type_is(in_fc_type,
+			BT_FIELD_CLASS_TYPE_SIGNED_INTEGER)) {
 		bt_field_integer_signed_set_value(out_field,
 				bt_field_integer_signed_get_value(in_field));
-		break;
-	case BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL:
+	} else if (in_fc_type == BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL) {
 		bt_field_real_single_precision_set_value(out_field,
 				bt_field_real_single_precision_get_value(in_field));
-		break;
-	case BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL:
+	} else if (in_fc_type == BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL) {
 		bt_field_real_double_precision_set_value(out_field,
 				bt_field_real_double_precision_get_value(in_field));
-		break;
-	case BT_FIELD_CLASS_TYPE_STRING:
-	{
+	} else if (in_fc_type == BT_FIELD_CLASS_TYPE_STRING) {
 		const char *str = bt_field_string_get_value(in_field);
 		bt_field_string_set_value_status status =
 			bt_field_string_set_value(out_field, str);
@@ -266,10 +259,7 @@ void copy_field_content(const bt_field *in_field, bt_field *out_field,
 			bt_current_thread_clear_error();
 
 		}
-		break;
-	}
-	case BT_FIELD_CLASS_TYPE_STRUCTURE:
-	{
+	} else if (in_fc_type == BT_FIELD_CLASS_TYPE_STRUCTURE) {
 		uint64_t i, nb_member_struct;
 		const bt_field *in_member_field;
 		bt_field *out_member_field;
@@ -303,12 +293,8 @@ void copy_field_content(const bt_field *in_field, bt_field *out_field,
 			copy_field_content(in_member_field,
 				out_member_field, log_level, self_comp);
 		}
-		break;
-	}
-	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
-		/* fall through */
-	case BT_FIELD_CLASS_TYPE_STATIC_ARRAY:
-	{
+	} else if (bt_field_class_type_is(in_fc_type,
+			BT_FIELD_CLASS_TYPE_ARRAY)) {
 		const bt_field *in_element_field;
 		bt_field *out_element_field;
 		uint64_t i, array_len;
@@ -316,7 +302,8 @@ void copy_field_content(const bt_field *in_field, bt_field *out_field,
 
 		array_len = bt_field_array_get_length(in_field);
 
-		if (in_fc_type == BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY) {
+		if (bt_field_class_type_is(in_fc_type,
+				BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY)) {
 			set_len_status = bt_field_array_dynamic_set_length(
 				out_field, array_len);
 			if (set_len_status !=
@@ -338,13 +325,8 @@ void copy_field_content(const bt_field *in_field, bt_field *out_field,
 			copy_field_content(in_element_field, out_element_field,
 				log_level, self_comp);
 		}
-		break;
-	}
-	case BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR:
-	case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR:
-	case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR:
-	case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR:
-	{
+	} else if (bt_field_class_type_is(in_fc_type,
+			BT_FIELD_CLASS_TYPE_OPTION)) {
 		const bt_field *in_option_field;
 		bt_field *out_option_field;
 
@@ -354,19 +336,14 @@ void copy_field_content(const bt_field *in_field, bt_field *out_field,
 			bt_field_option_set_has_field(out_field, BT_TRUE);
 			out_option_field = bt_field_option_borrow_field(
 				out_field);
-			BT_ASSERT(out_option_field);
+			BT_ASSERT_DBG(out_option_field);
 			copy_field_content(in_option_field, out_option_field,
 				log_level, self_comp);
 		} else {
 			bt_field_option_set_has_field(out_field, BT_FALSE);
 		}
-
-		break;
-	}
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR:
-	{
+	} else if (bt_field_class_type_is(in_fc_type,
+			BT_FIELD_CLASS_TYPE_VARIANT)) {
 		bt_field_variant_select_option_field_by_index_status sel_opt_status;
 		uint64_t in_selected_option_idx;
 		const bt_field *in_option_field;
@@ -390,12 +367,10 @@ void copy_field_content(const bt_field *in_field, bt_field *out_field,
 
 		copy_field_content(in_option_field, out_option_field,
 			log_level, self_comp);
-
-		break;
-	}
-	default:
+	} else {
 		abort();
 	}
+
 	BT_COMP_LOGT("Copied content of field: in-f-addr=%p, out-f-addr=%p",
 			in_field, out_field);
 }