From: Simon Marchi Date: Thu, 17 Feb 2022 04:10:29 +0000 (-0500) Subject: lib: adjust son dev/non-dev precondition assertions in field-class.c X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=b9ebcd13e15c83e69afc0e132a1d78bc5544abf4;p=babeltrace.git lib: adjust son dev/non-dev precondition assertions in field-class.c I found some functions using BT_ASSERT_PRE_DEV_FC_NON_NULL followed by either BT_ASSERT_PRE_FC_HAS_TYPE or BT_ASSERT_PRE_FC_IS_STRUCT (i.e. a dev followed by a non-dev). This seems illogical to me. Either the function is considered "fast path" and we use the dev versions, either it's not "fast path" and we use the non-dev versions. Change a few assertions to be dev. If some of these functions aren't actually considered fast path, then I think we should switch the BT_ASSERT_PRE_DEV_FC_NON_NULLs to be non-dev. Change-Id: I4f0c1cb0ef1006beddcc688d4e71f37fdb561e15 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/7326 Tested-by: jenkins Reviewed-by: Philippe Proulx Reviewed-on: https://review.lttng.org/c/babeltrace/+/10807 CI-Build: Philippe Proulx --- diff --git a/src/lib/trace-ir/field-class.c b/src/lib/trace-ir/field-class.c index cd9eeaba..753643f3 100644 --- a/src/lib/trace-ir/field-class.c +++ b/src/lib/trace-ir/field-class.c @@ -1075,7 +1075,7 @@ uint64_t bt_field_class_structure_get_member_count( struct bt_field_class_structure *struct_fc = (void *) fc; BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); - BT_ASSERT_PRE_FC_IS_STRUCT("field-class", fc, "Field class"); + BT_ASSERT_PRE_DEV_FC_IS_STRUCT("field-class", fc, "Field class"); return (uint64_t) struct_fc->common.named_fcs->len; } @@ -1097,7 +1097,7 @@ bt_field_class_structure_borrow_member_by_index_const( const struct bt_field_class *fc, uint64_t index) { BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); - BT_ASSERT_PRE_FC_IS_STRUCT("field-class", fc, "Field class"); + BT_ASSERT_PRE_DEV_FC_IS_STRUCT("field-class", fc, "Field class"); return (const void *) borrow_named_field_class_from_container_field_class_at_index( (void *) fc, index, __func__); @@ -1109,7 +1109,7 @@ bt_field_class_structure_borrow_member_by_index( struct bt_field_class *fc, uint64_t index) { BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); - BT_ASSERT_PRE_FC_IS_STRUCT("field-class", fc, "Field class"); + BT_ASSERT_PRE_DEV_FC_IS_STRUCT("field-class", fc, "Field class"); return (void *) borrow_named_field_class_from_container_field_class_at_index( (void *) fc, index, __func__); @@ -1144,7 +1144,7 @@ bt_field_class_structure_borrow_member_by_name_const( const struct bt_field_class *fc, const char *name) { BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); - BT_ASSERT_PRE_FC_IS_STRUCT("field-class", fc, "Field class"); + BT_ASSERT_PRE_DEV_FC_IS_STRUCT("field-class", fc, "Field class"); return (const void *) borrow_named_field_class_from_container_field_class_by_name( (void *) fc, name, __func__); @@ -1156,7 +1156,7 @@ bt_field_class_structure_borrow_member_by_name( struct bt_field_class *fc, const char *name) { BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); - BT_ASSERT_PRE_FC_IS_STRUCT("field-class", fc, "Field class"); + BT_ASSERT_PRE_DEV_FC_IS_STRUCT("field-class", fc, "Field class"); return (void *) borrow_named_field_class_from_container_field_class_by_name( (void *) fc, name, __func__); @@ -1884,7 +1884,7 @@ bt_field_class_variant_with_selector_field_integer_unsigned_borrow_option_by_nam const struct bt_field_class *fc, const char *name) { BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); - BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc, + BT_ASSERT_PRE_DEV_FC_HAS_TYPE("field-class", fc, "variant-field-class-with-unsigned-integer-selector-field", BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD, "Field class"); @@ -1899,7 +1899,7 @@ bt_field_class_variant_with_selector_field_integer_unsigned_borrow_option_by_ind const struct bt_field_class *fc, uint64_t index) { BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); - BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc, + BT_ASSERT_PRE_DEV_FC_HAS_TYPE("field-class", fc, "variant-field-class-with-unsigned-integer-selector-field", BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD, "Field class"); @@ -1914,7 +1914,7 @@ bt_field_class_variant_with_selector_field_integer_signed_borrow_option_by_name_ const struct bt_field_class *fc, const char *name) { BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); - BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc, + BT_ASSERT_PRE_DEV_FC_HAS_TYPE("field-class", fc, "variant-field-class-with-signed-integer-selector-field", BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD, "Field class"); @@ -1929,7 +1929,7 @@ bt_field_class_variant_with_selector_field_integer_signed_borrow_option_by_index const struct bt_field_class *fc, uint64_t index) { BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); - BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc, + BT_ASSERT_PRE_DEV_FC_HAS_TYPE("field-class", fc, "variant-field-class-with-signed-integer-selector-field", BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD, "Field class"); @@ -2112,7 +2112,7 @@ uint64_t bt_field_class_array_static_get_length(const struct bt_field_class *fc) const struct bt_field_class_array_static *array_fc = (const void *) fc; BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); - BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc, + BT_ASSERT_PRE_DEV_FC_HAS_TYPE("field-class", fc, "static-array-field-class", BT_FIELD_CLASS_TYPE_STATIC_ARRAY, "Field class"); return (uint64_t) array_fc->length;