X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Ffield.h;h=7262f827b576254c329cc5a66e07a7a586cf41dc;hb=d98421f2abfc5adab28ab7ee9b63537a6c7261cc;hp=3cd4bfe5699f745c12f2122bfad6b6c72e768fc2;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d;p=babeltrace.git diff --git a/src/lib/trace-ir/field.h b/src/lib/trace-ir/field.h index 3cd4bfe5..7262f827 100644 --- a/src/lib/trace-ir/field.h +++ b/src/lib/trace-ir/field.h @@ -1,33 +1,17 @@ -#ifndef BABELTRACE_TRACE_IR_FIELDS_INTERNAL_H -#define BABELTRACE_TRACE_IR_FIELDS_INTERNAL_H - /* + * SPDX-License-Identifier: MIT + * * Copyright 2017-2018 Philippe Proulx * Copyright 2013, 2014 Jérémie Galarneau - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. */ -#include "lib/assert-pre.h" +#ifndef BABELTRACE_TRACE_IR_FIELDS_INTERNAL_H +#define BABELTRACE_TRACE_IR_FIELDS_INTERNAL_H + +#include "lib/assert-cond.h" #include "common/common.h" #include "lib/object.h" -#include "common/babeltrace.h" +#include "common/macros.h" #include #include #include @@ -38,38 +22,60 @@ #include "field-class.h" #include "utils.h" -#define BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(_field, _cls_type, _name) \ - BT_ASSERT_PRE(((const struct bt_field *) (_field))->class->type == (_cls_type), \ +#define BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(_field, _cls_type, _name) \ + BT_ASSERT_PRE_DEV(((const struct bt_field *) (_field))->class->type == (_cls_type), \ _name " has the wrong class type: expected-class-type=%s, " \ "%![field-]+f", \ bt_common_field_class_type_string(_cls_type), (_field)) -#define BT_ASSERT_PRE_FIELD_IS_UNSIGNED_INT(_field, _name) \ - BT_ASSERT_PRE( \ +#define BT_ASSERT_PRE_DEV_FIELD_IS_UNSIGNED_INT(_field, _name) \ + BT_ASSERT_PRE_DEV( \ ((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER || \ ((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION, \ _name " is not an unsigned integer field: %![field-]+f", \ (_field)) -#define BT_ASSERT_PRE_FIELD_IS_SIGNED_INT(_field, _name) \ - BT_ASSERT_PRE( \ +#define BT_ASSERT_PRE_DEV_FIELD_IS_SIGNED_INT(_field, _name) \ + BT_ASSERT_PRE_DEV( \ ((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_SIGNED_INTEGER || \ ((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION, \ - _name " is not a signed integer field: %![field-]+f", \ + _name " is not a signed integer field: %![field-]+f", \ (_field)) -#define BT_ASSERT_PRE_FIELD_IS_ARRAY(_field, _name) \ - BT_ASSERT_PRE( \ +#define BT_ASSERT_PRE_DEV_FIELD_IS_ARRAY(_field, _name) \ + BT_ASSERT_PRE_DEV( \ ((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_STATIC_ARRAY || \ - ((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY, \ + ((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD || \ + ((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD, \ _name " is not an array field: %![field-]+f", (_field)) -#define BT_ASSERT_PRE_FIELD_IS_SET(_field, _name) \ - BT_ASSERT_PRE(bt_field_is_set(_field), \ +#define BT_ASSERT_PRE_DEV_FIELD_IS_DYNAMIC_ARRAY(_field, _name) \ + BT_ASSERT_PRE_DEV( \ + ((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD || \ + ((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD, \ + _name " is not a dynamic array field: %![field-]+f", (_field)) + +#define BT_ASSERT_PRE_DEV_FIELD_IS_OPTION(_field, _name) \ + BT_ASSERT_PRE_DEV( \ + ((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD || \ + ((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD || \ + ((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD || \ + ((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD, \ + _name " is not an option field: %![field-]+f", (_field)) + +#define BT_ASSERT_PRE_DEV_FIELD_IS_VARIANT(_field, _name) \ + BT_ASSERT_PRE_DEV( \ + ((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD || \ + ((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD || \ + ((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD, \ + _name " is not a variant field: %![field-]+f", (_field)) + +#define BT_ASSERT_PRE_DEV_FIELD_IS_SET(_field, _name) \ + BT_ASSERT_PRE_DEV(bt_field_is_set(_field), \ _name " is not set: %!+f", (_field)) -#define BT_ASSERT_PRE_FIELD_HOT(_field, _name) \ - BT_ASSERT_PRE_HOT((const struct bt_field *) (_field), (_name), \ +#define BT_ASSERT_PRE_DEV_FIELD_HOT(_field, _name) \ + BT_ASSERT_PRE_DEV_HOT((const struct bt_field *) (_field), (_name), \ ": %!+f", (_field)) struct bt_field; @@ -98,6 +104,16 @@ struct bt_field { bool frozen; }; +struct bt_field_bool { + struct bt_field common; + bool value; +}; + +struct bt_field_bit_array { + struct bt_field common; + uint64_t value_as_int; +}; + struct bt_field_integer { struct bt_field common; @@ -119,6 +135,16 @@ struct bt_field_structure { GPtrArray *fields; }; +struct bt_field_option { + struct bt_field common; + + /* Owned by this */ + struct bt_field *content_field; + + /* Weak: equal to `content_field` above or `NULL` */ + struct bt_field *selected_field; +}; + struct bt_field_variant { struct bt_field common; @@ -166,15 +192,15 @@ void _bt_field_set_is_frozen(const struct bt_field *field, bool is_frozen); static inline void _bt_field_reset(const struct bt_field *field) { - BT_ASSERT(field); - BT_ASSERT(field->methods->reset); + BT_ASSERT_DBG(field); + BT_ASSERT_DBG(field->methods->reset); field->methods->reset((void *) field); } static inline void _bt_field_set_single(struct bt_field *field, bool value) { - BT_ASSERT(field); + BT_ASSERT_DBG(field); field->is_set = value; } @@ -187,8 +213,7 @@ bt_bool _bt_field_is_set(const struct bt_field *field) goto end; } - BT_ASSERT(bt_field_class_has_known_type(field->class)); - BT_ASSERT(field->methods->is_set); + BT_ASSERT_DBG(field->methods->is_set); is_set = field->methods->is_set(field); end: