#define BT_LOG_TAG "ATTRS"
#include <babeltrace/lib-logging-internal.h>
-#include <babeltrace/ref.h>
+#include <babeltrace/object.h>
#include <babeltrace/babeltrace-internal.h>
#include <babeltrace/values.h>
#include <babeltrace/values-internal.h>
void bt_attributes_destroy(struct bt_value *attr_obj)
{
BT_LOGD("Destroying attributes object: addr=%p", attr_obj);
- bt_put(attr_obj);
+ bt_object_put_ref(attr_obj);
}
BT_HIDDEN
int64_t bt_attributes_get_count(struct bt_value *attr_obj)
{
- return bt_value_array_size(attr_obj);
+ return bt_value_array_get_size(attr_obj);
}
BT_HIDDEN
goto end;
}
- if (index >= bt_value_array_size(attr_obj)) {
+ if (index >= bt_value_array_get_size(attr_obj)) {
BT_LOGW("Invalid parameter: index is out of bounds: "
"index=%" PRIu64 ", count=%" PRId64,
- index, bt_value_array_size(attr_obj));
+ index, bt_value_array_get_size(attr_obj));
goto end;
}
- attr_field_obj = bt_value_array_borrow(attr_obj, index);
+ attr_field_obj = bt_value_array_borrow_element_by_index(attr_obj, index);
if (!attr_field_obj) {
BT_LOGE("Cannot get attributes object's array value's element by index: "
"value-addr=%p, index=%" PRIu64, attr_obj, index);
goto end;
}
- attr_field_name_obj = bt_value_array_borrow(attr_field_obj,
+ attr_field_name_obj = bt_value_array_borrow_element_by_index(attr_field_obj,
BT_ATTR_NAME_INDEX);
if (!attr_field_name_obj) {
BT_LOGE("Cannot get attribute array value's element by index: "
goto end;
}
- if (index >= bt_value_array_size(attr_obj)) {
+ if (index >= bt_value_array_get_size(attr_obj)) {
BT_LOGW("Invalid parameter: index is out of bounds: "
"index=%" PRIu64 ", count=%" PRId64,
- index, bt_value_array_size(attr_obj));
+ index, bt_value_array_get_size(attr_obj));
goto end;
}
- attr_field_obj = bt_value_array_borrow(attr_obj, index);
+ attr_field_obj = bt_value_array_borrow_element_by_index(attr_obj, index);
if (!attr_field_obj) {
BT_LOGE("Cannot get attributes object's array value's element by index: "
"value-addr=%p, index=%" PRIu64, attr_obj, index);
goto end;
}
- value_obj = bt_value_array_borrow(attr_field_obj,
+ value_obj = bt_value_array_borrow_element_by_index(attr_field_obj,
BT_ATTR_VALUE_INDEX);
if (!value_obj) {
BT_LOGE("Cannot get attribute array value's element by index: "
struct bt_value *value_obj = NULL;
struct bt_value *attr_field_name_obj = NULL;
- attr_size = bt_value_array_size(attr_obj);
+ attr_size = bt_value_array_get_size(attr_obj);
if (attr_size < 0) {
BT_LOGE("Cannot get array value's size: value-addr=%p",
attr_obj);
int ret;
const char *field_name;
- value_obj = bt_value_array_borrow(attr_obj, i);
+ value_obj = bt_value_array_borrow_element_by_index(attr_obj, i);
if (!value_obj) {
BT_LOGE("Cannot get attributes object's array value's element by index: "
"value-addr=%p, index=%" PRIu64, attr_obj, i);
goto error;
}
- attr_field_name_obj = bt_value_array_borrow(value_obj,
+ attr_field_name_obj = bt_value_array_borrow_element_by_index(value_obj,
BT_ATTR_NAME_INDEX);
if (!attr_field_name_obj) {
BT_LOGE("Cannot get attribute array value's element by index: "
attr_field_obj = bt_attributes_borrow_field_by_name(attr_obj, name);
if (attr_field_obj) {
- ret = bt_value_array_set(attr_field_obj,
+ ret = bt_value_array_set_element_by_index(attr_field_obj,
BT_ATTR_VALUE_INDEX, value_obj);
attr_field_obj = NULL;
goto end;
goto end;
}
- ret = bt_value_array_append_string(attr_field_obj, name);
- ret |= bt_value_array_append(attr_field_obj, value_obj);
+ ret = bt_value_array_append_string_element(attr_field_obj, name);
+ ret |= bt_value_array_append_element(attr_field_obj, value_obj);
if (ret) {
BT_LOGE("Cannot append elements to array value: addr=%p",
attr_field_obj);
goto end;
}
- ret = bt_value_array_append(attr_obj, attr_field_obj);
+ ret = bt_value_array_append_element(attr_obj, attr_field_obj);
if (ret) {
BT_LOGE("Cannot append element to array value: "
"array-value-addr=%p, element-value-addr=%p",
}
end:
- bt_put(attr_field_obj);
+ bt_object_put_ref(attr_field_obj);
return ret;
}
goto end;
}
- value_obj = bt_value_array_borrow(attr_field_obj,
+ value_obj = bt_value_array_borrow_element_by_index(attr_field_obj,
BT_ATTR_VALUE_INDEX);
if (!value_obj) {
BT_LOGE("Cannot get attribute array value's element by index: "
}
BT_LOGD("Freezing attributes object: value-addr=%p", attr_obj);
- count = bt_value_array_size(attr_obj);
+ count = bt_value_array_get_size(attr_obj);
BT_ASSERT(count >= 0);
/*