X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-sink%2Ftranslate-trace-ir-to-ctf-ir.c;h=6d32cb193e19c11742e8be61be688f149d8467ed;hb=9a6cc676da74dd78c3852a36822f75611664b869;hp=90f98e613c805e8e17fbb31e8ddb9b42b7d2d956;hpb=e1c423f9b7082e3d836f10285370f4db0ec1a2a5;p=babeltrace.git

diff --git a/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c b/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c
index 90f98e61..6d32cb19 100644
--- a/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c
+++ b/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c
@@ -575,7 +575,6 @@ void resolve_field_class(struct ctx *ctx,
 				tgt_field_ref, user_tgt_fc);
 			if (ret) {
 				*create_before = true;
-				ret = 0;
 				goto end;
 			}
 		}
@@ -830,29 +829,29 @@ int maybe_protect_variant_option_name(const bt_field_class *ir_var_fc,
 	}
 
 	/* Borrow option's ranges */
-	if (ir_var_fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR) {
+	if (ir_var_fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD) {
 		/* No ranges: we're done */
 		goto end;
-	} if (ir_var_fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR) {
-		const bt_field_class_variant_with_selector_integer_unsigned_option *var_opt =
-			bt_field_class_variant_with_selector_integer_unsigned_borrow_option_by_index_const(
+	} if (ir_var_fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD) {
+		const bt_field_class_variant_with_selector_field_integer_unsigned_option *var_opt =
+			bt_field_class_variant_with_selector_field_integer_unsigned_borrow_option_by_index_const(
 				ir_var_fc, opt_i);
 		opt_ranges =
-			bt_field_class_variant_with_selector_integer_unsigned_option_borrow_ranges_const(
+			bt_field_class_variant_with_selector_field_integer_unsigned_option_borrow_ranges_const(
 				var_opt);
 	} else {
-		const bt_field_class_variant_with_selector_integer_signed_option *var_opt =
-			bt_field_class_variant_with_selector_integer_signed_borrow_option_by_index_const(
+		const bt_field_class_variant_with_selector_field_integer_signed_option *var_opt =
+			bt_field_class_variant_with_selector_field_integer_signed_borrow_option_by_index_const(
 				ir_var_fc, opt_i);
 		opt_ranges =
-			bt_field_class_variant_with_selector_integer_signed_option_borrow_ranges_const(
+			bt_field_class_variant_with_selector_field_integer_signed_option_borrow_ranges_const(
 				var_opt);
 	}
 
 	/* Find corresponding mapping by range set in selector FC */
 	for (i = 0; i < bt_field_class_enumeration_get_mapping_count(ir_tag_fc);
 			i++) {
-		if (ir_var_fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR) {
+		if (ir_var_fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD) {
 			const bt_field_class_enumeration_mapping *mapping_base;
 			const bt_field_class_enumeration_unsigned_mapping *mapping;
 			const bt_integer_range_set_unsigned *mapping_ranges;
@@ -999,9 +998,9 @@ int translate_variant_field_class(struct ctx *ctx)
 	ir_fc_type = bt_field_class_get_type(fc->base.ir_fc);
 	opt_count = bt_field_class_variant_get_option_count(fc->base.ir_fc);
 
-	if (ir_fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR ||
-			ir_fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR) {
-		ir_selector_field_path = bt_field_class_variant_with_selector_borrow_selector_field_path_const(
+	if (bt_field_class_type_is(ir_fc_type,
+			BT_FIELD_CLASS_TYPE_VARIANT_WITH_SELECTOR_FIELD)) {
+		ir_selector_field_path = bt_field_class_variant_with_selector_field_borrow_selector_field_path_const(
 			fc->base.ir_fc);
 		BT_ASSERT(ir_selector_field_path);
 	}
@@ -1018,8 +1017,8 @@ int translate_variant_field_class(struct ctx *ctx)
 		bt_field_class_type type = bt_field_class_get_type(
 			tgt_fc->ir_fc);
 
-		if (type != BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION &&
-				type != BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION) {
+		if (!bt_field_class_type_is(type,
+				BT_FIELD_CLASS_TYPE_ENUMERATION)) {
 			fc->tag_is_before = true;
 			goto validate_opts;
 		}
@@ -1202,10 +1201,13 @@ int translate_dynamic_array_field_class(struct ctx *ctx)
 	BT_ASSERT(fc);
 
 	/* Resolve length field class before appending to parent */
-	resolve_field_class(ctx,
-		bt_field_class_array_dynamic_borrow_length_field_path_const(
-			fc->base.base.ir_fc),
-		fc->length_ref, &fc->length_is_before, NULL);
+	if (bt_field_class_get_type(cur_path_stack_top(ctx)->ir_fc) ==
+			BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD) {
+		resolve_field_class(ctx,
+			bt_field_class_array_dynamic_with_length_field_borrow_length_field_path_const(
+				fc->base.base.ir_fc),
+			fc->length_ref, &fc->length_is_before, NULL);
+	}
 
 	append_to_parent_field_class(ctx, (void *) fc);
 	ret = cur_path_stack_push(ctx, UINT64_C(-1), NULL, false, elem_ir_fc,
@@ -1304,48 +1306,35 @@ static
 int translate_field_class(struct ctx *ctx)
 {
 	int ret;
+	bt_field_class_type ir_fc_type =
+		bt_field_class_get_type(cur_path_stack_top(ctx)->ir_fc);
 
-	switch (bt_field_class_get_type(cur_path_stack_top(ctx)->ir_fc)) {
-	case BT_FIELD_CLASS_TYPE_BOOL:
+	if (ir_fc_type == BT_FIELD_CLASS_TYPE_BOOL) {
 		ret = translate_bool_field_class(ctx);
-		break;
-	case BT_FIELD_CLASS_TYPE_BIT_ARRAY:
+	} else if (ir_fc_type == BT_FIELD_CLASS_TYPE_BIT_ARRAY) {
 		ret = translate_bit_array_field_class(ctx);
-		break;
-	case BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER:
-	case BT_FIELD_CLASS_TYPE_SIGNED_INTEGER:
-	case BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION:
-	case BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION:
+	} else if (bt_field_class_type_is(ir_fc_type,
+			BT_FIELD_CLASS_TYPE_INTEGER)) {
 		ret = translate_integer_field_class(ctx);
-		break;
-	case BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL:
-	case BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL:
+	} else if (bt_field_class_type_is(ir_fc_type,
+			BT_FIELD_CLASS_TYPE_REAL)) {
 		ret = translate_real_field_class(ctx);
-		break;
-	case BT_FIELD_CLASS_TYPE_STRING:
+	} else if (ir_fc_type == BT_FIELD_CLASS_TYPE_STRING) {
 		ret = translate_string_field_class(ctx);
-		break;
-	case BT_FIELD_CLASS_TYPE_STRUCTURE:
+	} else if (ir_fc_type == BT_FIELD_CLASS_TYPE_STRUCTURE) {
 		ret = translate_structure_field_class(ctx);
-		break;
-	case BT_FIELD_CLASS_TYPE_STATIC_ARRAY:
+	} else if (ir_fc_type == BT_FIELD_CLASS_TYPE_STATIC_ARRAY) {
 		ret = translate_static_array_field_class(ctx);
-		break;
-	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
+	} else if (bt_field_class_type_is(ir_fc_type,
+			BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY)) {
 		ret = translate_dynamic_array_field_class(ctx);
-		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(ir_fc_type,
+			BT_FIELD_CLASS_TYPE_OPTION)) {
 		ret = translate_option_field_class(ctx);
-		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(ir_fc_type,
+			BT_FIELD_CLASS_TYPE_VARIANT)) {
 		ret = translate_variant_field_class(ctx);
-		break;
-	default:
+	} else {
 		abort();
 	}
 
@@ -1782,7 +1771,6 @@ int translate_stream_class(struct fs_sink_comp *fs_sink,
 					(*out_sc)->default_clock_class_name->str)) {
 				/* Invalid: create a new name */
 				make_unique_default_clock_class_name(*out_sc);
-				ret = 0;
 			}
 		} else {
 			/* No name: create a name */