/*
+ * SPDX-License-Identifier: MIT
+ *
* Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
* Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * 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.
*/
#define BT_LOG_TAG "LIB/FIELD-CLASS"
#include "lib/logging.h"
-#include "lib/assert-pre.h"
+#include "lib/assert-cond.h"
#include <babeltrace2/trace-ir/field-class.h>
-#include <babeltrace2/trace-ir/field-class-const.h>
-#include <babeltrace2/trace-ir/field-const.h>
#include <babeltrace2/trace-ir/field.h>
#include <babeltrace2/trace-ir/clock-class.h>
#include "lib/object.h"
#include "compat/glib.h"
#include <float.h>
#include <inttypes.h>
+#include <stdbool.h>
#include <stdlib.h>
#include "clock-class.h"
enum bt_field_class_type bt_field_class_get_type(
const struct bt_field_class *fc)
{
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
return fc->type;
}
{
struct bt_field_class_bit_array *ba_fc = NULL;
- BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
- BT_ASSERT_PRE(length > 0 && length <= 64,
+ BT_ASSERT_PRE_NO_ERROR();
+ BT_ASSERT_PRE_TC_NON_NULL(trace_class);
+ BT_ASSERT_PRE("valid-length", length > 0 && length <= 64,
"Unsupported length for bit array field class "
"(minimum is 1, maximum is 64): length=%" PRIu64, length);
BT_LOGD("Creating default bit array field class object.");
{
const struct bt_field_class_bit_array *ba_fc = (const void *) fc;
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_BIT_ARRAY,
- "Field class");
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_DEV_FC_HAS_TYPE("field-class", fc, "bit-array",
+ BT_FIELD_CLASS_TYPE_BIT_ARRAY, "Field class");
return ba_fc->length;
}
{
struct bt_field_class_bool *bool_fc = NULL;
- BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
+ BT_ASSERT_PRE_NO_ERROR();
+ BT_ASSERT_PRE_TC_NON_NULL(trace_class);
BT_LOGD("Creating default boolean field class object.");
bool_fc = g_new0(struct bt_field_class_bool, 1);
if (!bool_fc) {
{
struct bt_field_class_integer *int_fc = NULL;
- BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
+ BT_ASSERT_PRE_TC_NON_NULL(trace_class);
BT_LOGD("Creating default integer field class object: type=%s",
bt_common_field_class_type_string(type));
int_fc = g_new0(struct bt_field_class_integer, 1);
struct bt_field_class *bt_field_class_integer_unsigned_create(
bt_trace_class *trace_class)
{
+ BT_ASSERT_PRE_NO_ERROR();
+
return create_integer_field_class(trace_class,
BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER);
}
struct bt_field_class *bt_field_class_integer_signed_create(
bt_trace_class *trace_class)
{
+ BT_ASSERT_PRE_NO_ERROR();
+
return create_integer_field_class(trace_class,
BT_FIELD_CLASS_TYPE_SIGNED_INTEGER);
}
{
const struct bt_field_class_integer *int_fc = (const void *) fc;
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_IS_INT(fc, "Field class");
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_DEV_FC_IS_INT("field-class", fc, "Field class");
return int_fc->range;
}
{
struct bt_field_class_integer *int_fc = (void *) fc;
- BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_IS_INT(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_HOT(fc, "Field class");
- BT_ASSERT_PRE(size <= 64,
+ BT_ASSERT_PRE_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_FC_IS_INT("field-class", fc, "Field class");
+ BT_ASSERT_PRE_DEV_FC_HOT(fc);
+ BT_ASSERT_PRE("valid-n",
+ size >= 1 && size <= 64,
"Unsupported size for integer field class's field value range "
- "(maximum is 64): size=%" PRIu64, size);
- BT_ASSERT_PRE(
+ "(minimum is 1, maximum is 64): size=%" PRIu64, size);
+ BT_ASSERT_PRE("valid-n-for-enumeration-field-class",
int_fc->common.type == BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER ||
int_fc->common.type == BT_FIELD_CLASS_TYPE_SIGNED_INTEGER ||
size_is_valid_for_enumeration_field_class(fc, size),
{
const struct bt_field_class_integer *int_fc = (const void *) fc;
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_IS_INT(fc, "Field class");
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_DEV_FC_IS_INT("field-class", fc, "Field class");
return int_fc->base;
}
{
struct bt_field_class_integer *int_fc = (void *) fc;
- BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_IS_INT(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_HOT(fc, "Field class");
+ BT_ASSERT_PRE_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_FC_IS_INT("field-class", fc, "Field class");
+ BT_ASSERT_PRE_DEV_FC_HOT(fc);
int_fc->base = base;
BT_LIB_LOGD("Set integer field class's preferred display base: %!+F", fc);
}
{
struct bt_field_class_enumeration *enum_fc = NULL;
- BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
+ BT_ASSERT_PRE_TC_NON_NULL(trace_class);
BT_LOGD("Creating default enumeration field class object: type=%s",
bt_common_field_class_type_string(type));
enum_fc = g_new0(struct bt_field_class_enumeration, 1);
struct bt_field_class *bt_field_class_enumeration_unsigned_create(
bt_trace_class *trace_class)
{
+ BT_ASSERT_PRE_NO_ERROR();
+
return create_enumeration_field_class(trace_class,
BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION);
}
struct bt_field_class *bt_field_class_enumeration_signed_create(
bt_trace_class *trace_class)
{
+ BT_ASSERT_PRE_NO_ERROR();
+
return create_enumeration_field_class(trace_class,
BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION);
}
{
const struct bt_field_class_enumeration *enum_fc = (const void *) fc;
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_IS_ENUM(fc, "Field class");
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_DEV_FC_IS_ENUM("field-class", fc, "Field class");
return (uint64_t) enum_fc->mappings->len;
}
{
const struct bt_field_class_enumeration *enum_fc = (const void *) fc;
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
BT_ASSERT_PRE_DEV_VALID_INDEX(index, enum_fc->mappings->len);
- BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION,
- "Field class");
+ BT_ASSERT_PRE_DEV_FC_HAS_TYPE("field-class", fc, "unsigned-enumeration",
+ BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION, "Field class");
return (const void *) BT_FIELD_CLASS_ENUM_MAPPING_AT_INDEX(fc, index);
}
{
const struct bt_field_class_enumeration *enum_fc = (const void *) fc;
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
BT_ASSERT_PRE_DEV_VALID_INDEX(index, enum_fc->mappings->len);
- BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION,
- "Field class");
+ BT_ASSERT_PRE_DEV_FC_HAS_TYPE("field-class", fc, "signed-enumeration",
+ BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION, "Field class");
return (const void *) BT_FIELD_CLASS_ENUM_MAPPING_AT_INDEX(fc, index);
}
static
const struct bt_field_class_enumeration_mapping *
borrow_enumeration_field_class_mapping_by_label(
- const struct bt_field_class_enumeration *fc, const char *label)
+ const struct bt_field_class_enumeration *fc, const char *label,
+ const char *api_func)
{
struct bt_field_class_enumeration_mapping *mapping = NULL;
uint64_t i;
- BT_ASSERT(fc);
- BT_ASSERT_PRE_DEV_NON_NULL(label, "Label");
+ BT_ASSERT_DBG(fc);
+ BT_ASSERT_PRE_DEV_NON_NULL_FROM_FUNC(api_func, "label", label,
+ "Label");
for (i = 0; i < fc->mappings->len; i++) {
struct bt_field_class_enumeration_mapping *this_mapping =
bt_field_class_enumeration_signed_borrow_mapping_by_label_const(
const struct bt_field_class *fc, const char *label)
{
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION,
- "Field class");
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_DEV_FC_HAS_TYPE("field-class", fc, "signed-enumeration",
+ BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION, "Field class");
return (const void *) borrow_enumeration_field_class_mapping_by_label(
- (const void *) fc, label);
+ (const void *) fc, label, __func__);
}
const struct bt_field_class_enumeration_unsigned_mapping *
bt_field_class_enumeration_unsigned_borrow_mapping_by_label_const(
const struct bt_field_class *fc, const char *label)
{
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_HAS_ID(fc,
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_DEV_FC_HAS_TYPE("field-class", fc, "unsigned-enumeration",
BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION, "Field class");
return (const void *) borrow_enumeration_field_class_mapping_by_label(
- (const void *) fc, label);
+ (const void *) fc, label, __func__);
}
const char *bt_field_class_enumeration_mapping_get_label(
const struct bt_field_class_enumeration_mapping *mapping)
{
- BT_ASSERT_PRE_DEV_NON_NULL(mapping, "Enumeration field class mapping");
+ BT_ASSERT_PRE_DEV_NON_NULL("enumeration-field-class-mapping",
+ mapping, "Enumeration field class mapping");
return mapping->label->str;
}
const struct bt_field_class_enumeration_mapping *mapping =
(const void *) u_mapping;
- BT_ASSERT_PRE_DEV_NON_NULL(mapping, "Enumeration field class mapping");
+ BT_ASSERT_PRE_DEV_NON_NULL("enumeration-field-class-mapping",
+ mapping, "Enumeration field class mapping");
return (const void *) mapping->range_set;
}
const struct bt_field_class_enumeration_mapping *mapping =
(const void *) s_mapping;
- BT_ASSERT_PRE_DEV_NON_NULL(mapping, "Enumeration field class mapping");
+ BT_ASSERT_PRE_DEV_NON_NULL("enumeration-field-class-mapping",
+ mapping, "Enumeration field class mapping");
return (const void *) mapping->range_set;
}
const struct bt_field_class_enumeration *enum_fc = (const void *) fc;
uint64_t i;
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_NON_NULL(label_array, "Label array (output)");
- BT_ASSERT_PRE_DEV_NON_NULL(count, "Count (output)");
- BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION,
- "Field class");
+ BT_ASSERT_PRE_DEV_NO_ERROR();
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_DEV_NON_NULL("label-array-output", label_array,
+ "Label array (output)");
+ BT_ASSERT_PRE_DEV_NON_NULL("count-output", count, "Count (output)");
+ BT_ASSERT_PRE_DEV_FC_HAS_TYPE("field-class", fc, "unsigned-enumeration",
+ BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION, "Field class");
g_ptr_array_set_size(enum_fc->label_buf, 0);
for (i = 0; i < enum_fc->mappings->len; i++) {
const struct bt_field_class_enumeration *enum_fc = (const void *) fc;
uint64_t i;
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_NON_NULL(label_array, "Label array (output)");
- BT_ASSERT_PRE_DEV_NON_NULL(count, "Count (output)");
- BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION,
- "Field class");
+ BT_ASSERT_PRE_DEV_NO_ERROR();
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_DEV_NON_NULL("label-array-output", label_array,
+ "Label array (output)");
+ BT_ASSERT_PRE_DEV_NON_NULL("count-output", count, "Count (output)");
+ BT_ASSERT_PRE_DEV_FC_HAS_TYPE("field-class", fc, "signed-enumeration",
+ BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION, "Field class");
g_ptr_array_set_size(enum_fc->label_buf, 0);
for (i = 0; i < enum_fc->mappings->len; i++) {
static inline
enum bt_field_class_enumeration_add_mapping_status
add_mapping_to_enumeration_field_class(struct bt_field_class *fc,
- const char *label, const struct bt_integer_range_set *range_set)
+ const char *label, const struct bt_integer_range_set *range_set,
+ const char *api_func)
{
enum bt_field_class_enumeration_add_mapping_status status =
BT_FUNC_STATUS_OK;
struct bt_field_class_enumeration *enum_fc = (void *) fc;
struct bt_field_class_enumeration_mapping mapping = { 0 };
+ BT_ASSERT_PRE_NO_ERROR_FROM_FUNC(api_func);
BT_ASSERT(fc);
- BT_ASSERT_PRE_NON_NULL(label, "Label");
- BT_ASSERT_PRE_NON_NULL(range_set, "Integer range set");
- BT_ASSERT_PRE(!enumeration_field_class_has_mapping_with_label(
- enum_fc, label),
+ BT_ASSERT_PRE_NON_NULL_FROM_FUNC(api_func, "label", label, "Label");
+ BT_ASSERT_PRE_INT_RANGE_SET_NON_NULL_FROM_FUNC(api_func, range_set);
+ BT_ASSERT_PRE_FROM_FUNC(api_func,
+ "enumeration-field-class-mapping-label-is-unique",
+ !enumeration_field_class_has_mapping_with_label(
+ enum_fc, label),
"Duplicate mapping name in enumeration field class: "
"%![enum-fc-]+F, label=\"%s\"", fc, label);
mapping.range_set = range_set;
struct bt_field_class *fc, const char *label,
const struct bt_integer_range_set_unsigned *range_set)
{
- BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION,
- "Field class");
+ BT_ASSERT_PRE_NO_ERROR();
+ BT_ASSERT_PRE_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc,
+ "unsigned-enumeration-field-class",
+ BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION, "Field class");
return add_mapping_to_enumeration_field_class(fc, label,
- (const void *) range_set);
+ (const void *) range_set, __func__);
}
enum bt_field_class_enumeration_add_mapping_status
struct bt_field_class *fc, const char *label,
const struct bt_integer_range_set_signed *range_set)
{
- BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION,
- "Field class");
+ BT_ASSERT_PRE_NO_ERROR();
+ BT_ASSERT_PRE_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc,
+ "signed-enumeration-field-class",
+ BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION, "Field class");
return add_mapping_to_enumeration_field_class(fc, label,
- (const void *) range_set);
+ (const void *) range_set, __func__);
}
static
{
struct bt_field_class_real *real_fc = NULL;
- BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
+ BT_ASSERT_PRE_TC_NON_NULL(trace_class);
BT_LOGD("Creating default real field class object: type=%s",
bt_common_field_class_type_string(type));
real_fc = g_new0(struct bt_field_class_real, 1);
struct bt_field_class *bt_field_class_real_single_precision_create(
bt_trace_class *trace_class)
{
+ BT_ASSERT_PRE_NO_ERROR();
+
return create_real_field_class(trace_class,
BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL);
}
struct bt_field_class *bt_field_class_real_double_precision_create(
bt_trace_class *trace_class)
{
+ BT_ASSERT_PRE_NO_ERROR();
+
return create_real_field_class(trace_class,
BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL);
}
}
static
-void destroy_variant_with_selector_option(gpointer ptr)
+void destroy_variant_with_selector_field_option(gpointer ptr)
{
- struct bt_field_class_variant_with_selector_option *opt = ptr;
+ struct bt_field_class_variant_with_selector_field_option *opt = ptr;
if (ptr) {
finalize_named_field_class(&opt->common);
int ret;
struct bt_field_class_structure *struct_fc = NULL;
- BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
+ BT_ASSERT_PRE_NO_ERROR();
+ BT_ASSERT_PRE_TC_NON_NULL(trace_class);
BT_LOGD_STR("Creating default structure field class object.");
struct_fc = g_new0(struct bt_field_class_structure, 1);
if (!struct_fc) {
}
static
-struct bt_field_class_variant_with_selector_option *
-create_variant_with_selector_option(
+struct bt_field_class_variant_with_selector_field_option *
+create_variant_with_selector_field_option(
const char *name, struct bt_field_class *fc,
const struct bt_integer_range_set *range_set)
{
- struct bt_field_class_variant_with_selector_option *opt = g_new0(
- struct bt_field_class_variant_with_selector_option, 1);
+ struct bt_field_class_variant_with_selector_field_option *opt = g_new0(
+ struct bt_field_class_variant_with_selector_field_option, 1);
BT_ASSERT(range_set);
goto end;
error:
- destroy_variant_with_selector_option(opt);
+ destroy_variant_with_selector_field_option(opt);
opt = NULL;
end:
static
int append_named_field_class_to_container_field_class(
struct bt_field_class_named_field_class_container *container_fc,
- struct bt_named_field_class *named_fc)
+ struct bt_named_field_class *named_fc, const char *api_func,
+ const char *unique_entry_precond_id)
{
BT_ASSERT(container_fc);
BT_ASSERT(named_fc);
- BT_ASSERT_PRE_DEV_FC_HOT(container_fc, "Field class");
- BT_ASSERT_PRE(!bt_g_hash_table_contains(container_fc->name_to_index,
- named_fc->name->str),
+ BT_ASSERT_PRE_DEV_FC_HOT_FROM_FUNC(api_func, container_fc);
+ BT_ASSERT_PRE_FROM_FUNC(api_func, unique_entry_precond_id,
+ !bt_g_hash_table_contains(container_fc->name_to_index,
+ named_fc->name->str),
"Duplicate member/option name in structure/variant field class: "
"%![container-fc-]+F, name=\"%s\"", container_fc,
named_fc->name->str);
enum bt_field_class_structure_append_member_status status;
struct bt_named_field_class *named_fc = NULL;
- BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_STRUCTURE,
- "Field class");
+ BT_ASSERT_PRE_NO_ERROR();
+ BT_ASSERT_PRE_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_FC_IS_STRUCT("field-class", fc, "Field class");
named_fc = create_named_field_class(name, member_fc);
if (!named_fc) {
/* create_named_field_class() logs errors */
}
status = append_named_field_class_to_container_field_class((void *) fc,
- named_fc);
+ named_fc, __func__,
+ "structure-field-class-member-name-is-unique");
if (status == BT_FUNC_STATUS_OK) {
/* Moved to the container */
named_fc = NULL;
{
struct bt_field_class_structure *struct_fc = (void *) fc;
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_STRUCTURE,
- "Field class");
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_FC_IS_STRUCT("field-class", fc, "Field class");
return (uint64_t) struct_fc->common.named_fcs->len;
}
struct bt_named_field_class *
borrow_named_field_class_from_container_field_class_at_index(
struct bt_field_class_named_field_class_container *fc,
- uint64_t index)
+ uint64_t index, const char *api_func)
{
- BT_ASSERT(fc);
- BT_ASSERT_PRE_DEV_VALID_INDEX(index, fc->named_fcs->len);
+ BT_ASSERT_DBG(fc);
+ BT_ASSERT_PRE_DEV_VALID_INDEX_FROM_FUNC(api_func, index,
+ fc->named_fcs->len);
return fc->named_fcs->pdata[index];
}
bt_field_class_structure_borrow_member_by_index_const(
const struct bt_field_class *fc, uint64_t index)
{
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_STRUCTURE,
- "Field class");
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_FC_IS_STRUCT("field-class", fc, "Field class");
return (const void *)
borrow_named_field_class_from_container_field_class_at_index(
- (void *) fc, index);
+ (void *) fc, index, __func__);
}
struct bt_field_class_structure_member *
bt_field_class_structure_borrow_member_by_index(
struct bt_field_class *fc, uint64_t index)
{
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_STRUCTURE,
- "Field class");
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_FC_IS_STRUCT("field-class", fc, "Field class");
return (void *)
borrow_named_field_class_from_container_field_class_at_index(
- (void *) fc, index);
+ (void *) fc, index, __func__);
}
static
struct bt_named_field_class *
borrow_named_field_class_from_container_field_class_by_name(
struct bt_field_class_named_field_class_container *fc,
- const char *name)
+ const char *name, const char *api_func)
{
struct bt_named_field_class *named_fc = NULL;
gpointer orig_key;
gpointer value;
- BT_ASSERT(fc);
- BT_ASSERT_PRE_DEV_NON_NULL(name, "Name");
+ BT_ASSERT_DBG(fc);
+ BT_ASSERT_PRE_DEV_NAME_NON_NULL_FROM_FUNC(api_func, name);
if (!g_hash_table_lookup_extended(fc->name_to_index, name, &orig_key,
&value)) {
goto end;
bt_field_class_structure_borrow_member_by_name_const(
const struct bt_field_class *fc, const char *name)
{
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_STRUCTURE,
- "Field class");
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_FC_IS_STRUCT("field-class", fc, "Field class");
return (const void *)
borrow_named_field_class_from_container_field_class_by_name(
- (void *) fc, name);
+ (void *) fc, name, __func__);
}
struct bt_field_class_structure_member *
bt_field_class_structure_borrow_member_by_name(
struct bt_field_class *fc, const char *name)
{
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_STRUCTURE,
- "Field class");
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_FC_IS_STRUCT("field-class", fc, "Field class");
return (void *)
borrow_named_field_class_from_container_field_class_by_name(
- (void *) fc, name);
+ (void *) fc, name, __func__);
}
const char *bt_field_class_structure_member_get_name(
{
const struct bt_named_field_class *named_fc = (const void *) member;
- BT_ASSERT_PRE_DEV_NON_NULL(member, "Structure field class member");
+ BT_ASSERT_PRE_DEV_STRUCT_FC_MEMBER_NON_NULL(member);
return named_fc->name->str;
}
{
const struct bt_named_field_class *named_fc = (const void *) member;
- BT_ASSERT_PRE_DEV_NON_NULL(member, "Structure field class member");
+ BT_ASSERT_PRE_DEV_STRUCT_FC_MEMBER_NON_NULL(member);
return named_fc->fc;
}
{
struct bt_named_field_class *named_fc = (void *) member;
- BT_ASSERT_PRE_DEV_NON_NULL(member, "Structure field class member");
+ BT_ASSERT_PRE_DEV_STRUCT_FC_MEMBER_NON_NULL(member);
return named_fc->fc;
}
BT_LOGD_STR("Putting content field class.");
BT_OBJECT_PUT_REF_AND_RESET(fc->content_fc);
- if (fc->common.type != BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR) {
- struct bt_field_class_option_with_selector *with_sel_fc =
+ if (fc->common.type != BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD) {
+ struct bt_field_class_option_with_selector_field *with_sel_fc =
(void *) obj;
BT_LOGD_STR("Putting selector field path.");
BT_LOGD_STR("Putting selector field class.");
BT_OBJECT_PUT_REF_AND_RESET(with_sel_fc->selector_fc);
- if (fc->common.type != BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR) {
- struct bt_field_class_option_with_selector_integer *with_int_sel_fc =
+ if (fc->common.type != BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD) {
+ struct bt_field_class_option_with_selector_field_integer *with_int_sel_fc =
(void *) obj;
BT_LOGD_STR("Putting integer range set.");
struct bt_trace_class *trace_class,
enum bt_field_class_type fc_type,
struct bt_field_class *content_fc,
- struct bt_field_class *selector_fc)
+ struct bt_field_class *selector_fc,
+ const char *api_func)
{
struct bt_field_class_option *opt_fc = NULL;
- BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
- BT_ASSERT_PRE_NON_NULL(content_fc, "Content field class");
+ BT_ASSERT_PRE_NO_ERROR_FROM_FUNC(api_func);
+ BT_ASSERT_PRE_TC_NON_NULL_FROM_FUNC(api_func, trace_class);
+ BT_ASSERT_PRE_NON_NULL_FROM_FUNC(api_func, "content-field-class",
+ content_fc, "Content field class");
BT_LIB_LOGD("Creating option field class: "
"type=%s, %![content-fc-]+F, %![sel-fc-]+F",
bt_common_field_class_type_string(fc_type),
content_fc, selector_fc);
- if (fc_type != BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR) {
- struct bt_field_class_option_with_selector *opt_with_sel_fc = NULL;
+ if (fc_type != BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD) {
+ struct bt_field_class_option_with_selector_field *opt_with_sel_fc = NULL;
- BT_ASSERT_PRE_NON_NULL(selector_fc, "Selector field class");
+ BT_ASSERT_PRE_NON_NULL_FROM_FUNC(api_func,
+ "selector-field-class", selector_fc,
+ "Selector field class");
- if (fc_type == BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR) {
- BT_ASSERT_PRE_FC_HAS_ID(selector_fc,
- BT_FIELD_CLASS_TYPE_BOOL,
+ if (fc_type == BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD) {
+ BT_ASSERT_PRE_FC_HAS_TYPE_FROM_FUNC(api_func,
+ "selector-field-class", selector_fc,
+ "boolean-field-class", BT_FIELD_CLASS_TYPE_BOOL,
"Selector field class");
opt_with_sel_fc = (void *) g_new0(
- struct bt_field_class_option_with_selector_bool, 1);
+ struct bt_field_class_option_with_selector_field_bool, 1);
} else {
- BT_ASSERT_PRE_FC_IS_INT(selector_fc,
- "Selector field class");
+ BT_ASSERT_PRE_FC_IS_INT_FROM_FUNC(api_func,
+ "selector-field-class",
+ selector_fc, "Selector field class");
opt_with_sel_fc = (void *) g_new0(
- struct bt_field_class_option_with_selector_integer, 1);
+ struct bt_field_class_option_with_selector_field_integer, 1);
}
if (!opt_with_sel_fc) {
struct bt_field_class *content_fc)
{
return create_option_field_class(trace_class,
- BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR,
- content_fc, NULL);
+ BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD,
+ content_fc, NULL, __func__);
}
-struct bt_field_class *bt_field_class_option_with_selector_bool_create(
+struct bt_field_class *bt_field_class_option_with_selector_field_bool_create(
struct bt_trace_class *trace_class,
struct bt_field_class *content_fc,
struct bt_field_class *selector_fc)
{
- struct bt_field_class_option_with_selector_bool *fc =
- (void *) create_option_field_class(trace_class,
- BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR,
- content_fc, selector_fc);
-
- if (!fc) {
- goto end;
- }
+ BT_ASSERT_PRE_NO_ERROR();
-end:
- return (void *) fc;
+ return create_option_field_class(trace_class,
+ BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD,
+ content_fc, selector_fc, __func__);
}
struct bt_field_class *
-bt_field_class_option_with_selector_integer_unsigned_create(
+bt_field_class_option_with_selector_field_integer_unsigned_create(
struct bt_trace_class *trace_class,
struct bt_field_class *content_fc,
struct bt_field_class *selector_fc,
const struct bt_integer_range_set_unsigned *u_range_set)
{
- struct bt_field_class_option_with_selector_integer *fc;
+ struct bt_field_class_option_with_selector_field_integer *fc;
const struct bt_integer_range_set *range_set =
(const void *) u_range_set;
- BT_ASSERT_PRE_NON_NULL(range_set, "Integer range set");
- BT_ASSERT_PRE(range_set->ranges->len > 0,
- "Integer range set is empty: %!+R", range_set);
+ BT_ASSERT_PRE_NO_ERROR();
+ BT_ASSERT_PRE_INT_RANGE_SET_NON_NULL(range_set);
+ BT_ASSERT_PRE_INT_RANGE_SET_NOT_EMPTY(range_set);
fc = (void *) create_option_field_class(trace_class,
- BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR,
- content_fc, selector_fc);
+ BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD,
+ content_fc, selector_fc, __func__);
if (!fc) {
goto end;
}
struct bt_field_class *
-bt_field_class_option_with_selector_integer_signed_create(
+bt_field_class_option_with_selector_field_integer_signed_create(
struct bt_trace_class *trace_class,
struct bt_field_class *content_fc,
struct bt_field_class *selector_fc,
const struct bt_integer_range_set_signed *i_range_set)
{
- struct bt_field_class_option_with_selector_integer *fc;
+ struct bt_field_class_option_with_selector_field_integer *fc;
const struct bt_integer_range_set *range_set =
(const void *) i_range_set;
- BT_ASSERT_PRE_NON_NULL(range_set, "Integer range set");
- BT_ASSERT_PRE(range_set->ranges->len > 0,
- "Integer range set is empty: %!+R", range_set);
+ BT_ASSERT_PRE_NO_ERROR();
+ BT_ASSERT_PRE_INT_RANGE_SET_NON_NULL(range_set);
+ BT_ASSERT_PRE_INT_RANGE_SET_NOT_EMPTY(range_set);
fc = (void *) create_option_field_class(trace_class,
- BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR,
- content_fc, selector_fc);
+ BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD,
+ content_fc, selector_fc, __func__);
if (!fc) {
goto end;
{
struct bt_field_class_option *opt_fc = (void *) fc;
- BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_IS_OPTION(fc, "Field class");
+ BT_ASSERT_PRE_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_FC_IS_OPTION("field-class", fc, "Field class");
return opt_fc->content_fc;
}
{
struct bt_field_class_option *opt_fc = (void *) fc;
- BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_IS_OPTION(fc, "Field class");
+ BT_ASSERT_PRE_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_FC_IS_OPTION("field-class", fc, "Field class");
return opt_fc->content_fc;
}
const struct bt_field_path *
-bt_field_class_option_with_selector_borrow_selector_field_path_const(
+bt_field_class_option_with_selector_field_borrow_selector_field_path_const(
const struct bt_field_class *fc)
{
- const struct bt_field_class_option_with_selector *opt_fc =
+ const struct bt_field_class_option_with_selector_field *opt_fc =
(const void *) fc;
- BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_IS_OPTION_WITH_SEL(fc, "Field class");
+ BT_ASSERT_PRE_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_FC_IS_OPTION_WITH_SEL("field-class", fc, "Field class");
return opt_fc->selector_field_path;
}
-void bt_field_class_option_with_selector_bool_set_selector_is_reversed(
+void bt_field_class_option_with_selector_field_bool_set_selector_is_reversed(
struct bt_field_class *fc, bt_bool sel_is_reversed)
{
- struct bt_field_class_option_with_selector_bool *opt_fc = (void *) fc;
+ struct bt_field_class_option_with_selector_field_bool *opt_fc = (void *) fc;
- BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_HAS_ID(fc,
- BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR, "Field class");
- BT_ASSERT_PRE_DEV_FC_HOT(fc, "Field class");
+ BT_ASSERT_PRE_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc,
+ "option-field-class-with-boolean-selector-field",
+ BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD,
+ "Field class");
+ BT_ASSERT_PRE_DEV_FC_HOT(fc);
opt_fc->sel_is_reversed = sel_is_reversed;
}
-bt_bool bt_field_class_option_with_selector_bool_selector_is_reversed(
+bt_bool bt_field_class_option_with_selector_field_bool_selector_is_reversed(
const struct bt_field_class *fc)
{
- struct bt_field_class_option_with_selector_bool *opt_fc = (void *) fc;
+ struct bt_field_class_option_with_selector_field_bool *opt_fc = (void *) fc;
- BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_HAS_ID(fc,
- BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR, "Field class");
+ BT_ASSERT_PRE_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc,
+ "option-field-class-with-boolean-selector-field",
+ BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD,
+ "Field class");
return opt_fc->sel_is_reversed;
}
const struct bt_integer_range_set_unsigned *
-bt_field_class_option_with_selector_integer_unsigned_borrow_selector_ranges_const(
+bt_field_class_option_with_selector_field_integer_unsigned_borrow_selector_ranges_const(
const struct bt_field_class *fc)
{
- struct bt_field_class_option_with_selector_integer *opt_fc =
+ struct bt_field_class_option_with_selector_field_integer *opt_fc =
(void *) fc;
- BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_IS_OPTION_WITH_INT_SEL(fc, "Field class");
+ BT_ASSERT_PRE_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_FC_IS_OPTION_WITH_INT_SEL("field-class", fc,
+ "Field class");
return (const void *) opt_fc->range_set;
}
const struct bt_integer_range_set_signed *
-bt_field_class_option_with_selector_integer_signed_borrow_selector_ranges_const(
+bt_field_class_option_with_selector_field_integer_signed_borrow_selector_ranges_const(
const struct bt_field_class *fc)
{
- struct bt_field_class_option_with_selector_integer *opt_fc =
+ struct bt_field_class_option_with_selector_field_integer *opt_fc =
(void *) fc;
- BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_FC_IS_OPTION_WITH_INT_SEL(fc, "Field class");
+ BT_ASSERT_PRE_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_FC_IS_OPTION_WITH_INT_SEL("field-class", fc,
+ "Field class");
return (const void *) opt_fc->range_set;
}
}
static
-void destroy_variant_with_selector_field_class(struct bt_object *obj)
+void destroy_variant_with_selector_field_field_class(struct bt_object *obj)
{
- struct bt_field_class_variant_with_selector *fc = (void *) obj;
+ struct bt_field_class_variant_with_selector_field *fc = (void *) obj;
BT_ASSERT(fc);
finalize_variant_field_class(&fc->common);
{
int ret;
struct bt_field_class_variant *var_fc = NULL;
- struct bt_field_class_variant_with_selector *var_with_sel_fc = NULL;
+ struct bt_field_class_variant_with_selector_field *var_with_sel_fc = NULL;
enum bt_field_class_type fc_type;
- BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
+ BT_ASSERT_PRE_NO_ERROR();
+ BT_ASSERT_PRE_TC_NON_NULL(trace_class);
if (selector_fc) {
- BT_ASSERT_PRE_FC_IS_INT(selector_fc, "Selector field class");
+ BT_ASSERT_PRE_FC_IS_INT("selector-field-class", selector_fc,
+ "Selector field class");
}
BT_LIB_LOGD("Creating default variant field class: %![sel-fc-]+F",
if (selector_fc) {
var_with_sel_fc = g_new0(
- struct bt_field_class_variant_with_selector, 1);
+ struct bt_field_class_variant_with_selector_field, 1);
if (!var_with_sel_fc) {
BT_LIB_LOGE_APPEND_CAUSE(
"Failed to allocate one variant field class with selector.");
goto error;
}
- if (selector_fc->type == BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER ||
- selector_fc->type == BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION) {
- fc_type = BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR;
+ if (bt_field_class_type_is(selector_fc->type,
+ BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER)) {
+ fc_type = BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD;
} else {
- fc_type = BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR;
+ fc_type = BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD;
}
ret = init_named_field_classes_container(
(void *) var_with_sel_fc, fc_type,
- destroy_variant_with_selector_field_class,
- destroy_variant_with_selector_option);
+ destroy_variant_with_selector_field_field_class,
+ destroy_variant_with_selector_field_option);
if (ret) {
/* init_named_field_classes_container() logs errors */
goto error;
}
ret = init_named_field_classes_container((void *) var_fc,
- BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR,
+ BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD,
destroy_variant_field_class, destroy_named_field_class);
if (ret) {
/* init_named_field_classes_container() logs errors */
error:
BT_OBJECT_PUT_REF_AND_RESET(var_fc);
+ BT_OBJECT_PUT_REF_AND_RESET(var_with_sel_fc);
end:
return (void *) var_fc;
}
+#define VAR_FC_OPT_NAME_IS_UNIQUE_ID \
+ "variant-field-class-option-name-is-unique"
+
enum bt_field_class_variant_without_selector_append_option_status
bt_field_class_variant_without_selector_append_option(struct bt_field_class *fc,
const char *name, struct bt_field_class *option_fc)
enum bt_field_class_variant_without_selector_append_option_status status;
struct bt_named_field_class *named_fc = NULL;
- BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_NON_NULL(name, "Name");
- BT_ASSERT_PRE_NON_NULL(option_fc, "Option field class");
- BT_ASSERT_PRE_FC_HAS_ID(fc,
- BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR, "Field class");
+ BT_ASSERT_PRE_NO_ERROR();
+ BT_ASSERT_PRE_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_NAME_NON_NULL(name);
+ BT_ASSERT_PRE_NON_NULL("option-field-class", option_fc,
+ "Option field class");
+ BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc,
+ "variant-field-class-without-selector-field",
+ BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD,
+ "Field class");
named_fc = create_named_field_class(name, option_fc);
if (!named_fc) {
/* create_named_field_class() logs errors */
}
status = append_named_field_class_to_container_field_class((void *) fc,
- named_fc);
+ named_fc, __func__, VAR_FC_OPT_NAME_IS_UNIQUE_ID);
if (status == BT_FUNC_STATUS_OK) {
/* Moved to the container */
named_fc = NULL;
/* Add existing option ranges */
for (i = 0; i < var_fc_opts->len; i++) {
- struct bt_field_class_variant_with_selector_option *opt =
+ struct bt_field_class_variant_with_selector_field_option *opt =
var_fc_opts->pdata[i];
uint64_t j;
}
static
-int append_option_to_variant_with_selector_field_class(
+int append_option_to_variant_with_selector_field_field_class(
struct bt_field_class *fc, const char *name,
struct bt_field_class *option_fc,
const struct bt_integer_range_set *range_set,
- enum bt_field_class_type expected_type)
+ enum bt_field_class_type expected_type,
+ const char *api_func)
{
int status;
- struct bt_field_class_variant_with_selector *var_fc = (void *) fc;
- struct bt_field_class_variant_with_selector_option *opt = NULL;
+ struct bt_field_class_variant_with_selector_field *var_fc = (void *) fc;
+ struct bt_field_class_variant_with_selector_field_option *opt = NULL;
bool has_overlap;
- BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_NON_NULL(name, "Name");
- BT_ASSERT_PRE_NON_NULL(option_fc, "Option field class");
- BT_ASSERT_PRE_NON_NULL(range_set, "Integer range set");
- BT_ASSERT_PRE_FC_HAS_ID(fc, expected_type, "Field class");
- BT_ASSERT_PRE(range_set->ranges->len > 0,
- "Integer range set is empty: %!+R", range_set);
+ BT_ASSERT(fc);
+ BT_ASSERT_PRE_NAME_NON_NULL_FROM_FUNC(api_func, name);
+ BT_ASSERT_PRE_NON_NULL_FROM_FUNC(api_func, "option-field-class",
+ option_fc, "Option field class");
+ BT_ASSERT_PRE_INT_RANGE_SET_NON_NULL_FROM_FUNC(api_func, range_set);
+ BT_ASSERT_PRE_INT_RANGE_SET_NOT_EMPTY_FROM_FUNC(api_func, range_set);
status = ranges_overlap(var_fc->common.common.named_fcs, range_set,
- expected_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR,
+ expected_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD,
&has_overlap);
if (status) {
/* ranges_overlap() logs errors */
goto end;
}
- BT_ASSERT_PRE(!has_overlap,
+ BT_ASSERT_PRE_FROM_FUNC(api_func, "ranges-do-not-overlap",
+ !has_overlap,
"Integer range set's ranges and existing ranges have an overlap: "
"%!+R", range_set);
- opt = create_variant_with_selector_option(name, option_fc, range_set);
+ opt = create_variant_with_selector_field_option(name, option_fc, range_set);
if (!opt) {
- /* create_variant_with_selector_option() logs errors */
+ /* create_variant_with_selector_field_option() logs errors */
status = BT_FUNC_STATUS_MEMORY_ERROR;
goto end;
}
status = append_named_field_class_to_container_field_class((void *) fc,
- &opt->common);
+ &opt->common, __func__, VAR_FC_OPT_NAME_IS_UNIQUE_ID);
if (status == BT_FUNC_STATUS_OK) {
/* Moved to the container */
opt = NULL;
end:
if (opt) {
- destroy_variant_with_selector_option(opt);
+ destroy_variant_with_selector_field_option(opt);
}
return status;
}
-enum bt_field_class_variant_with_selector_integer_append_option_status
-bt_field_class_variant_with_selector_integer_unsigned_append_option(
+enum bt_field_class_variant_with_selector_field_integer_append_option_status
+bt_field_class_variant_with_selector_field_integer_unsigned_append_option(
struct bt_field_class *fc, const char *name,
struct bt_field_class *option_fc,
const struct bt_integer_range_set_unsigned *range_set)
{
- return append_option_to_variant_with_selector_field_class(fc,
+ BT_ASSERT_PRE_NO_ERROR();
+ BT_ASSERT_PRE_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_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");
+ return append_option_to_variant_with_selector_field_field_class(fc,
name, option_fc, (const void *) range_set,
- BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR);
+ BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD,
+ __func__);
}
-enum bt_field_class_variant_with_selector_integer_append_option_status
-bt_field_class_variant_with_selector_integer_signed_append_option(
+enum bt_field_class_variant_with_selector_field_integer_append_option_status
+bt_field_class_variant_with_selector_field_integer_signed_append_option(
struct bt_field_class *fc, const char *name,
struct bt_field_class *option_fc,
const struct bt_integer_range_set_signed *range_set)
{
- return append_option_to_variant_with_selector_field_class(fc,
+ BT_ASSERT_PRE_NO_ERROR();
+ BT_ASSERT_PRE_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_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");
+ return append_option_to_variant_with_selector_field_field_class(fc,
name, option_fc, (const void *) range_set,
- BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR);
+ BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD,
+ __func__);
}
uint64_t bt_field_class_variant_get_option_count(const struct bt_field_class *fc)
{
const struct bt_field_class_variant *var_fc = (const void *) fc;
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_IS_VARIANT(fc, "Field class");
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_DEV_FC_IS_VARIANT("field-class", fc, "Field class");
return (uint64_t) var_fc->common.named_fcs->len;
}
bt_field_class_variant_borrow_option_by_name_const(
const struct bt_field_class *fc, const char *name)
{
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_IS_VARIANT(fc, "Field class");
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_DEV_FC_IS_VARIANT("field-class", fc, "Field class");
return (const void *)
borrow_named_field_class_from_container_field_class_by_name(
- (void *) fc, name);
+ (void *) fc, name, __func__);
}
const struct bt_field_class_variant_option *
bt_field_class_variant_borrow_option_by_index_const(
const struct bt_field_class *fc, uint64_t index)
{
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_IS_VARIANT(fc, "Field class");
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_DEV_FC_IS_VARIANT("field-class", fc, "Field class");
return (const void *)
borrow_named_field_class_from_container_field_class_at_index(
- (void *) fc, index);
+ (void *) fc, index, __func__);
}
struct bt_field_class_variant_option *
bt_field_class_variant_borrow_option_by_name(
struct bt_field_class *fc, const char *name)
{
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_IS_VARIANT(fc, "Field class");
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_DEV_FC_IS_VARIANT("field-class", fc, "Field class");
return (void *)
borrow_named_field_class_from_container_field_class_by_name(
- (void *) fc, name);
+ (void *) fc, name, __func__);
}
struct bt_field_class_variant_option *
bt_field_class_variant_borrow_option_by_index(
struct bt_field_class *fc, uint64_t index)
{
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_IS_VARIANT(fc, "Field class");
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_DEV_FC_IS_VARIANT("field-class", fc, "Field class");
return (void *)
borrow_named_field_class_from_container_field_class_at_index(
- (void *) fc, index);
+ (void *) fc, index, __func__);
}
-const struct bt_field_class_variant_with_selector_integer_unsigned_option *
-bt_field_class_variant_with_selector_integer_unsigned_borrow_option_by_name_const(
+const struct bt_field_class_variant_with_selector_field_integer_unsigned_option *
+bt_field_class_variant_with_selector_field_integer_unsigned_borrow_option_by_name_const(
const struct bt_field_class *fc, const char *name)
{
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_HAS_ID(fc,
- BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR,
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_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");
return (const void *)
borrow_named_field_class_from_container_field_class_by_name(
- (void *) fc, name);
+ (void *) fc, name, __func__);
}
-const struct bt_field_class_variant_with_selector_integer_unsigned_option *
-bt_field_class_variant_with_selector_integer_unsigned_borrow_option_by_index_const(
+const struct bt_field_class_variant_with_selector_field_integer_unsigned_option *
+bt_field_class_variant_with_selector_field_integer_unsigned_borrow_option_by_index_const(
const struct bt_field_class *fc, uint64_t index)
{
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_HAS_ID(fc,
- BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR,
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_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");
return (const void *)
borrow_named_field_class_from_container_field_class_at_index(
- (void *) fc, index);
+ (void *) fc, index, __func__);
}
-const struct bt_field_class_variant_with_selector_integer_signed_option *
-bt_field_class_variant_with_selector_integer_signed_borrow_option_by_name_const(
+const struct bt_field_class_variant_with_selector_field_integer_signed_option *
+bt_field_class_variant_with_selector_field_integer_signed_borrow_option_by_name_const(
const struct bt_field_class *fc, const char *name)
{
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_HAS_ID(fc,
- BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR,
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_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");
return (const void *)
borrow_named_field_class_from_container_field_class_by_name(
- (void *) fc, name);
+ (void *) fc, name, __func__);
}
-const struct bt_field_class_variant_with_selector_integer_signed_option *
-bt_field_class_variant_with_selector_integer_signed_borrow_option_by_index_const(
+const struct bt_field_class_variant_with_selector_field_integer_signed_option *
+bt_field_class_variant_with_selector_field_integer_signed_borrow_option_by_index_const(
const struct bt_field_class *fc, uint64_t index)
{
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_HAS_ID(fc,
- BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR,
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_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");
return (const void *)
borrow_named_field_class_from_container_field_class_at_index(
- (void *) fc, index);
+ (void *) fc, index, __func__);
}
const char *bt_field_class_variant_option_get_name(
{
const struct bt_named_field_class *named_fc = (const void *) option;
- BT_ASSERT_PRE_DEV_NON_NULL(option, "Variant field class option");
+ BT_ASSERT_PRE_DEV_VAR_FC_OPT_NON_NULL(option);
return named_fc->name->str;
}
{
const struct bt_named_field_class *named_fc = (const void *) option;
- BT_ASSERT_PRE_DEV_NON_NULL(option, "Variant field class option");
+ BT_ASSERT_PRE_DEV_VAR_FC_OPT_NON_NULL(option);
return named_fc->fc;
}
{
struct bt_named_field_class *named_fc = (void *) option;
- BT_ASSERT_PRE_DEV_NON_NULL(option, "Variant field class option");
+ BT_ASSERT_PRE_DEV_VAR_FC_OPT_NON_NULL(option);
return named_fc->fc;
}
const struct bt_integer_range_set_unsigned *
-bt_field_class_variant_with_selector_integer_unsigned_option_borrow_ranges_const(
- const struct bt_field_class_variant_with_selector_integer_unsigned_option *option)
+bt_field_class_variant_with_selector_field_integer_unsigned_option_borrow_ranges_const(
+ const struct bt_field_class_variant_with_selector_field_integer_unsigned_option *option)
{
- const struct bt_field_class_variant_with_selector_option *opt =
+ const struct bt_field_class_variant_with_selector_field_option *opt =
(const void *) option;
- BT_ASSERT_PRE_DEV_NON_NULL(option, "Variant field class option");
+ BT_ASSERT_PRE_DEV_VAR_FC_OPT_NON_NULL(option);
return (const void *) opt->range_set;
}
const struct bt_integer_range_set_signed *
-bt_field_class_variant_with_selector_integer_signed_option_borrow_ranges_const(
- const struct bt_field_class_variant_with_selector_integer_signed_option *option)
+bt_field_class_variant_with_selector_field_integer_signed_option_borrow_ranges_const(
+ const struct bt_field_class_variant_with_selector_field_integer_signed_option *option)
{
- const struct bt_field_class_variant_with_selector_option *opt =
+ const struct bt_field_class_variant_with_selector_field_option *opt =
(const void *) option;
- BT_ASSERT_PRE_DEV_NON_NULL(option, "Variant field class option");
+ BT_ASSERT_PRE_DEV_VAR_FC_OPT_NON_NULL(option);
return (const void *) opt->range_set;
}
const struct bt_field_path *
-bt_field_class_variant_with_selector_borrow_selector_field_path_const(
+bt_field_class_variant_with_selector_field_borrow_selector_field_path_const(
const struct bt_field_class *fc)
{
- const struct bt_field_class_variant_with_selector *var_fc =
+ const struct bt_field_class_variant_with_selector_field *var_fc =
(const void *) fc;
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_IS_VARIANT_WITH_SEL(fc, "Field class");
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_DEV_FC_IS_VARIANT_WITH_SEL("field-class", fc,
+ "Field class");
return var_fc->selector_field_path;
}
{
struct bt_field_class_array_static *array_fc = NULL;
- BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
- BT_ASSERT_PRE_NON_NULL(element_fc, "Element field class");
+ BT_ASSERT_PRE_NO_ERROR();
+ BT_ASSERT_PRE_TC_NON_NULL(trace_class);
+ BT_ASSERT_PRE_NON_NULL("element-field-class", element_fc,
+ "Element field class");
BT_LOGD_STR("Creating default static array field class object.");
array_fc = g_new0(struct bt_field_class_array_static, 1);
if (!array_fc) {
{
const struct bt_field_class_array *array_fc = (const void *) fc;
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_IS_ARRAY(fc, "Field class");
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_DEV_FC_IS_ARRAY("field-class", fc, "Field class");
return array_fc->element_fc;
}
{
struct bt_field_class_array *array_fc = (void *) fc;
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_IS_ARRAY(fc, "Field class");
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_DEV_FC_IS_ARRAY("field-class", fc, "Field class");
return array_fc->element_fc;
}
{
const struct bt_field_class_array_static *array_fc = (const void *) fc;
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_STATIC_ARRAY,
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc,
+ "static-array-field-class", BT_FIELD_CLASS_TYPE_STATIC_ARRAY,
"Field class");
return (uint64_t) array_fc->length;
}
{
struct bt_field_class_array_dynamic *array_fc = NULL;
- BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
- BT_ASSERT_PRE_NON_NULL(element_fc, "Element field class");
+ BT_ASSERT_PRE_NO_ERROR();
+ BT_ASSERT_PRE_TC_NON_NULL(trace_class);
+ BT_ASSERT_PRE_NON_NULL("element-field-class", element_fc,
+ "Element field class");
BT_LOGD_STR("Creating default dynamic array field class object.");
array_fc = g_new0(struct bt_field_class_array_dynamic, 1);
if (!array_fc) {
}
if (init_array_field_class((void *) array_fc,
- BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY,
+ length_fc ?
+ BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD :
+ BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD,
destroy_dynamic_array_field_class, element_fc)) {
goto error;
}
if (length_fc) {
- BT_ASSERT_PRE_FC_IS_UNSIGNED_INT(length_fc,
- "Length field class");
+ BT_ASSERT_PRE_FC_IS_UNSIGNED_INT("length-field-class",
+ length_fc, "Length field class");
array_fc->length_fc = length_fc;
bt_object_get_ref_no_null_check(array_fc->length_fc);
bt_field_class_freeze(length_fc);
}
const struct bt_field_path *
-bt_field_class_array_dynamic_borrow_length_field_path_const(
+bt_field_class_array_dynamic_with_length_field_borrow_length_field_path_const(
const struct bt_field_class *fc)
{
const struct bt_field_class_array_dynamic *seq_fc = (const void *) fc;
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY,
+ BT_ASSERT_PRE_NO_ERROR();
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc,
+ "dynamic-array-field-class-with-length-field",
+ BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD,
"Field class");
return seq_fc->length_field_path;
}
{
struct bt_field_class_string *string_fc = NULL;
- BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
+ BT_ASSERT_PRE_NO_ERROR();
+ BT_ASSERT_PRE_TC_NON_NULL(trace_class);
BT_LOGD_STR("Creating default string field class object.");
string_fc = g_new0(struct bt_field_class_string, 1);
if (!string_fc) {
bt_value_freeze(fc->user_attributes);
fc->frozen = true;
- switch (fc->type) {
- case BT_FIELD_CLASS_TYPE_STRUCTURE:
- 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:
- {
+ if (fc->type == BT_FIELD_CLASS_TYPE_STRUCTURE ||
+ bt_field_class_type_is(fc->type,
+ BT_FIELD_CLASS_TYPE_VARIANT)) {
struct bt_field_class_named_field_class_container *container_fc =
(void *) fc;
uint64_t i;
bt_named_field_class_freeze(
container_fc->named_fcs->pdata[i]);
}
-
- break;
- }
- default:
- break;
}
}
struct bt_field_class *fc = (void *) c_fc;
BT_ASSERT(fc);
- BT_ASSERT_PRE(!fc->part_of_trace_class,
- "Field class is already part of a trace: %!+F", fc);
+ BT_ASSERT_PRE("field-class-is-not-part-of-trace-class",
+ !fc->part_of_trace_class,
+ "Field class is already part of a trace class: %!+F", fc);
fc->part_of_trace_class = true;
- switch (fc->type) {
- case BT_FIELD_CLASS_TYPE_STRUCTURE:
- 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:
- {
+ if (fc->type == BT_FIELD_CLASS_TYPE_STRUCTURE ||
+ bt_field_class_type_is(fc->type,
+ BT_FIELD_CLASS_TYPE_VARIANT)) {
struct bt_field_class_named_field_class_container *container_fc =
(void *) fc;
uint64_t i;
bt_field_class_make_part_of_trace_class(named_fc->fc);
}
-
- break;
- }
- case BT_FIELD_CLASS_TYPE_STATIC_ARRAY:
- case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
- {
+ } else if (bt_field_class_type_is(fc->type,
+ BT_FIELD_CLASS_TYPE_ARRAY)) {
struct bt_field_class_array *array_fc = (void *) fc;
bt_field_class_make_part_of_trace_class(array_fc->element_fc);
- break;
- }
- default:
- break;
}
}
const struct bt_value *bt_field_class_borrow_user_attributes_const(
const struct bt_field_class *fc)
{
- BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
+ BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
return fc->user_attributes;
}
struct bt_field_class *fc,
const struct bt_value *user_attributes)
{
- BT_ASSERT_PRE_NON_NULL(fc, "Field class");
- BT_ASSERT_PRE_NON_NULL(user_attributes, "User attributes");
- BT_ASSERT_PRE(user_attributes->type == BT_VALUE_TYPE_MAP,
- "User attributes object is not a map value object.");
- BT_ASSERT_PRE_DEV_FC_HOT(fc, "Field class");
+ BT_ASSERT_PRE_FC_NON_NULL(fc);
+ BT_ASSERT_PRE_USER_ATTRS_NON_NULL(user_attributes);
+ BT_ASSERT_PRE_USER_ATTRS_IS_MAP(user_attributes);
+ BT_ASSERT_PRE_DEV_FC_HOT(fc);
bt_object_put_ref_no_null_check(fc->user_attributes);
fc->user_attributes = (void *) user_attributes;
bt_object_get_ref_no_null_check(fc->user_attributes);
}
static
-void bt_named_field_class_set_user_attributes(
+void set_named_field_class_user_attributes(
struct bt_named_field_class *named_fc,
- const struct bt_value *user_attributes)
+ const struct bt_value *user_attributes, const char *api_func)
{
- BT_ASSERT_PRE_NON_NULL(user_attributes, "User attributes");
- BT_ASSERT_PRE(user_attributes->type == BT_VALUE_TYPE_MAP,
- "User attributes object is not a map value object.");
- BT_ASSERT_PRE_DEV_HOT(named_fc,
- "Structure field class member or variant field class option",
- ".");
+ BT_ASSERT_PRE_USER_ATTRS_NON_NULL_FROM_FUNC(api_func, user_attributes);
+ BT_ASSERT_PRE_USER_ATTRS_NON_NULL_FROM_FUNC(api_func, user_attributes);
bt_object_put_ref_no_null_check(named_fc->user_attributes);
named_fc->user_attributes = (void *) user_attributes;
bt_object_get_ref_no_null_check(named_fc->user_attributes);
bt_field_class_structure_member_borrow_user_attributes_const(
const struct bt_field_class_structure_member *member)
{
- BT_ASSERT_PRE_NON_NULL(member, "Structure field class member");
+ BT_ASSERT_PRE_STRUCT_FC_MEMBER_NON_NULL(member);
return bt_named_field_class_borrow_user_attributes_const(
(const void *) member);
}
bt_field_class_structure_member_borrow_user_attributes(
struct bt_field_class_structure_member *member)
{
- BT_ASSERT_PRE_NON_NULL(member, "Structure field class member");
+ BT_ASSERT_PRE_STRUCT_FC_MEMBER_NON_NULL(member);
return (void *) bt_named_field_class_borrow_user_attributes_const(
(void *) member);
}
struct bt_field_class_structure_member *member,
const struct bt_value *user_attributes)
{
- BT_ASSERT_PRE_NON_NULL(member, "Structure field class member");
- bt_named_field_class_set_user_attributes((void *) member,
- user_attributes);
+ BT_ASSERT_PRE_STRUCT_FC_MEMBER_NON_NULL(member);
+ BT_ASSERT_PRE_DEV_HOT("structure-field-class-member",
+ (struct bt_named_field_class *) member,
+ "Structure field class member", ".");
+ set_named_field_class_user_attributes((void *) member,
+ user_attributes, __func__);
}
const struct bt_value *bt_field_class_variant_option_borrow_user_attributes_const(
const struct bt_field_class_variant_option *option)
{
- BT_ASSERT_PRE_NON_NULL(option, "Variant field class option");
+ BT_ASSERT_PRE_VAR_FC_OPT_NON_NULL(option);
return bt_named_field_class_borrow_user_attributes_const(
(const void *) option);
}
struct bt_value *bt_field_class_variant_option_borrow_user_attributes(
struct bt_field_class_variant_option *option)
{
- BT_ASSERT_PRE_NON_NULL(option, "Variant field class option");
+ BT_ASSERT_PRE_VAR_FC_OPT_NON_NULL(option);
return (void *) bt_named_field_class_borrow_user_attributes_const(
(void *) option);
}
struct bt_field_class_variant_option *option,
const struct bt_value *user_attributes)
{
- BT_ASSERT_PRE_NON_NULL(option, "Variant field class option");
- bt_named_field_class_set_user_attributes((void *) option,
- user_attributes);
+ BT_ASSERT_PRE_VAR_FC_OPT_NON_NULL(option);
+ BT_ASSERT_PRE_DEV_HOT("variant-field-class-option",
+ (struct bt_named_field_class *) option,
+ "Variant field class option", ".");
+ set_named_field_class_user_attributes((void *) option,
+ user_attributes, __func__);
}
void bt_field_class_get_ref(const struct bt_field_class *field_class)
projects / babeltrace.git / blobdiff