X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-sink%2Ftranslate-trace-ir-to-ctf-ir.c;h=90f98e613c805e8e17fbb31e8ddb9b42b7d2d956;hb=cd933d89b741dfa969ce05fbf471c6c682d6825e;hp=fa79548b83d8162271f4b935d34efc7d177c1a1c;hpb=fe4df857056b4a03898f1031f136359ce733b0f5;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 fa79548b..90f98e61 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
@@ -833,26 +833,26 @@ int maybe_protect_variant_option_name(const bt_field_class *ir_var_fc,
 	if (ir_var_fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR) {
 		/* No ranges: we're done */
 		goto end;
-	} if (ir_var_fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR) {
-		const bt_field_class_variant_with_selector_unsigned_option *var_opt =
-			bt_field_class_variant_with_selector_unsigned_borrow_option_by_index_const(
+	} 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(
 				ir_var_fc, opt_i);
 		opt_ranges =
-			bt_field_class_variant_with_selector_unsigned_option_borrow_ranges_const(
+			bt_field_class_variant_with_selector_integer_unsigned_option_borrow_ranges_const(
 				var_opt);
 	} else {
-		const bt_field_class_variant_with_selector_signed_option *var_opt =
-			bt_field_class_variant_with_selector_signed_borrow_option_by_index_const(
+		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(
 				ir_var_fc, opt_i);
 		opt_ranges =
-			bt_field_class_variant_with_selector_signed_option_borrow_ranges_const(
+			bt_field_class_variant_with_selector_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_SELECTOR) {
+		if (ir_var_fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR) {
 			const bt_field_class_enumeration_mapping *mapping_base;
 			const bt_field_class_enumeration_unsigned_mapping *mapping;
 			const bt_integer_range_set_unsigned *mapping_ranges;
@@ -862,7 +862,7 @@ int maybe_protect_variant_option_name(const bt_field_class *ir_var_fc,
 			mapping_ranges = bt_field_class_enumeration_unsigned_mapping_borrow_ranges_const(
 				mapping);
 
-			if (bt_integer_range_set_unsigned_compare(opt_ranges,
+			if (bt_integer_range_set_unsigned_is_equal(opt_ranges,
 					mapping_ranges)) {
 				/* We have a winner */
 				mapping_base =
@@ -883,7 +883,7 @@ int maybe_protect_variant_option_name(const bt_field_class *ir_var_fc,
 			mapping_ranges = bt_field_class_enumeration_signed_mapping_borrow_ranges_const(
 				mapping);
 
-			if (bt_integer_range_set_signed_compare(opt_ranges,
+			if (bt_integer_range_set_signed_is_equal(opt_ranges,
 					mapping_ranges)) {
 				/* We have a winner */
 				mapping_base =
@@ -999,8 +999,8 @@ 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_SELECTOR ||
-			ir_fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR) {
+	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(
 			fc->base.ir_fc);
 		BT_ASSERT(ir_selector_field_path);
@@ -1092,7 +1092,7 @@ validate_opts:
 			opt_name_b =
 				bt_value_array_borrow_element_by_index_const(
 					prot_opt_names, j);
-			if (bt_value_compare(opt_name_a, opt_name_b)) {
+			if (bt_value_is_equal(opt_name_a, opt_name_b)) {
 				/*
 				 * Variant FC option names are not
 				 * unique when protected.
@@ -1334,12 +1334,15 @@ int translate_field_class(struct ctx *ctx)
 	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
 		ret = translate_dynamic_array_field_class(ctx);
 		break;
-	case BT_FIELD_CLASS_TYPE_OPTION:
+	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:
 		ret = translate_option_field_class(ctx);
 		break;
 	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:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR:
 		ret = translate_variant_field_class(ctx);
 		break;
 	default: