#include <string.h>
#include <inttypes.h>
-#include <babeltrace2/ctf-writer/object.h>
+#include <babeltrace2-ctf-writer/object.h>
#include <babeltrace2/types.h>
#include "common/assert.h"
bt_ctf_value_array_borrow_element_by_index(
array_obj, i);
- BT_ASSERT(element_obj);
+ BT_ASSERT_DBG(element_obj);
BT_LOGD("Copying array value's element: element-addr=%p, "
"index=%d", element_obj, i);
ret = bt_ctf_value_copy(&element_obj_copy, element_obj);
goto end;
}
- BT_ASSERT(element_obj_copy);
+ BT_ASSERT_DBG(element_obj_copy);
ret = bt_ctf_private_value_array_append_element(copy_obj,
(void *) element_obj_copy);
BT_CTF_OBJECT_PUT_REF_AND_RESET(element_obj_copy);
while (g_hash_table_iter_next(&iter, &key, &element_obj)) {
const char *key_str = g_quark_to_string(GPOINTER_TO_UINT(key));
- BT_ASSERT(key_str);
+ BT_ASSERT_DBG(key_str);
BT_LOGD("Copying map value's element: element-addr=%p, "
"key=\"%s\"", element_obj, key_str);
ret = bt_ctf_value_copy(&element_obj_copy, element_obj);
goto end;
}
- BT_ASSERT(element_obj_copy);
+ BT_ASSERT_DBG(element_obj_copy);
ret = bt_ctf_private_value_map_insert_entry(copy_obj, key_str,
(void *) element_obj_copy);
BT_CTF_OBJECT_PUT_REF_AND_RESET(element_obj_copy);
const struct bt_ctf_value_array *array_obj_a =
BT_CTF_VALUE_TO_ARRAY(object_a);
- if (bt_ctf_value_array_get_size(object_a) !=
- bt_ctf_value_array_get_size(object_b)) {
+ if (bt_ctf_value_array_get_length(object_a) !=
+ bt_ctf_value_array_get_length(object_b)) {
BT_LOGT("Array values are different: size mismatch "
"value-a-addr=%p, value-b-addr=%p, "
"value-a-size=%" PRId64 ", value-b-size=%" PRId64,
object_a, object_b,
- bt_ctf_value_array_get_size(object_a),
- bt_ctf_value_array_get_size(object_b));
+ bt_ctf_value_array_get_length(object_a),
+ bt_ctf_value_array_get_length(object_b));
ret = BT_CTF_FALSE;
goto end;
}
{
enum bt_ctf_value_status ret = BT_CTF_VALUE_STATUS_OK;
- BT_ASSERT(object);
+ BT_ASSERT_DBG(object);
if (object->frozen) {
goto end;
}
BT_HIDDEN
-uint64_t bt_ctf_value_array_get_size(const struct bt_ctf_value *array_obj)
+uint64_t bt_ctf_value_array_get_length(const struct bt_ctf_value *array_obj)
{
BT_CTF_ASSERT_PRE_NON_NULL(array_obj, "Value object");
BT_CTF_ASSERT_PRE_VALUE_IS_TYPE(array_obj, BT_CTF_VALUE_TYPE_ARRAY);
goto error;
}
- BT_ASSERT(extension_obj_elem_copy);
+ BT_ASSERT_DBG(extension_obj_elem_copy);
/* Replace in extended object */
extend_data->status = bt_ctf_private_value_map_insert_entry(
goto end;
error:
- BT_ASSERT(extend_data->status != BT_CTF_VALUE_STATUS_OK);
+ BT_ASSERT_DBG(extend_data->status != BT_CTF_VALUE_STATUS_OK);
ret = BT_CTF_FALSE;
end:
goto error;
}
- BT_ASSERT(extended_map_obj);
+ BT_ASSERT_DBG(extended_map_obj);
/*
* For each key in the extension map object, replace this key