*/
#define BT_LOG_TAG "LIB/ATTRS"
-#include "lib/lib-logging.h"
+#include "lib/logging.h"
#include "common/macros.h"
#include <babeltrace2/value.h>
#include "lib/assert-pre.h"
#include "lib/object.h"
-#include <babeltrace2/value-const.h>
+#include <babeltrace2/value.h>
#include "lib/value.h"
#include "attributes.h"
#include <inttypes.h>
BT_LOGD_STR("Creating attributes object.");
attr_obj = bt_value_array_create();
if (!attr_obj) {
- BT_LOGE_STR("Failed to create array value.");
+ BT_LIB_LOGE_APPEND_CAUSE("Failed to create array value.");
} else {
BT_LOGD("Created attributes object: addr=%p",
attr_obj);
}
BT_HIDDEN
-int64_t bt_attributes_get_count(const struct bt_value *attr_obj)
+uint64_t bt_attributes_get_count(const struct bt_value *attr_obj)
{
- return bt_value_array_get_size(attr_obj);
+ return bt_value_array_get_length(attr_obj);
}
BT_HIDDEN
const char *bt_attributes_get_field_name(const struct bt_value *attr_obj,
uint64_t index)
{
- const char *ret = NULL;
const struct bt_value *attr_field_obj = NULL;
const struct bt_value *attr_field_name_obj = NULL;
- if (!attr_obj) {
- BT_LOGW_STR("Invalid parameter: attributes object is NULL.");
- goto end;
- }
-
- 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_get_size(attr_obj));
- goto end;
- }
-
+ BT_ASSERT_DBG(attr_obj);
+ BT_ASSERT_DBG(index < bt_value_array_get_length(attr_obj));
attr_field_obj = bt_value_array_borrow_element_by_index_const(
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_element_by_index_const(attr_field_obj,
BT_ATTR_NAME_INDEX);
- if (!attr_field_name_obj) {
- BT_LOGE("Cannot get attribute array value's element by index: "
- "value-addr=%p, index=%" PRIu64, attr_field_obj,
- (uint64_t) BT_ATTR_NAME_INDEX);
- goto end;
- }
-
- ret = bt_value_string_get(attr_field_name_obj);
-end:
- return ret;
+ return bt_value_string_get(attr_field_name_obj);
}
BT_HIDDEN
struct bt_value *bt_attributes_borrow_field_value(
struct bt_value *attr_obj, uint64_t index)
{
- struct bt_value *value_obj = NULL;
struct bt_value *attr_field_obj = NULL;
- if (!attr_obj) {
- BT_LOGW_STR("Invalid parameter: attributes object is NULL.");
- goto end;
- }
-
- 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_get_size(attr_obj));
- goto end;
- }
+ BT_ASSERT_DBG(attr_obj);
+ BT_ASSERT_DBG(index < bt_value_array_get_length(attr_obj));
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_element_by_index(
- attr_field_obj, BT_ATTR_VALUE_INDEX);
- if (!value_obj) {
- BT_LOGE("Cannot get attribute array value's element by index: "
- "value-addr=%p, index=%" PRIu64, attr_field_obj,
- (uint64_t) BT_ATTR_VALUE_INDEX);
- }
-
-end:
- return value_obj;
+ return bt_value_array_borrow_element_by_index( attr_field_obj,
+ BT_ATTR_VALUE_INDEX);
}
static
struct bt_value *bt_attributes_borrow_field_by_name(
struct bt_value *attr_obj, const char *name)
{
- uint64_t i;
- int64_t attr_size;
+ uint64_t i, attr_size;
struct bt_value *value_obj = NULL;
struct bt_value *attr_field_name_obj = NULL;
- 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);
- goto error;
- }
-
+ attr_size = bt_value_array_get_length(attr_obj);
for (i = 0; i < attr_size; ++i) {
const char *field_name;
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_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: "
- "value-addr=%p, index=%" PRIu64,
- value_obj, (int64_t) BT_ATTR_NAME_INDEX);
- goto error;
- }
field_name = bt_value_string_get(attr_field_name_obj);
- if (!strcmp(field_name, name)) {
+ if (strcmp(field_name, name) == 0) {
break;
}
}
return value_obj;
-
-error:
- value_obj = NULL;
- return value_obj;
}
BT_HIDDEN
int ret = 0;
struct bt_value *attr_field_obj = NULL;
- if (!attr_obj || !name || !value_obj) {
- BT_LOGW("Invalid parameter: attributes object, name, or value object is NULL: "
- "attr-value-addr=%p, name-addr=%p, value-addr=%p",
- attr_obj, name, value_obj);
- ret = -1;
- goto end;
- }
-
+ BT_ASSERT(attr_obj);
+ BT_ASSERT(name);
+ BT_ASSERT(value_obj);
attr_field_obj = bt_attributes_borrow_field_by_name(attr_obj, name);
if (attr_field_obj) {
ret = bt_value_array_set_element_by_index(
attr_field_obj = bt_value_array_create();
if (!attr_field_obj) {
- BT_LOGE_STR("Failed to create empty array value.");
+ BT_LIB_LOGE_APPEND_CAUSE("Failed to create empty array value.");
ret = -1;
goto end;
}
ret |= bt_value_array_append_element(attr_field_obj,
value_obj);
if (ret) {
- BT_LOGE("Cannot append elements to array value: addr=%p",
+ BT_LIB_LOGE_APPEND_CAUSE(
+ "Cannot append elements to array value: %!+v",
attr_field_obj);
goto end;
}
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",
+ BT_LIB_LOGE_APPEND_CAUSE(
+ "Cannot append element to array value: "
+ "%![array-value-]+v, %![element-value-]+v",
attr_obj, attr_field_obj);
}
struct bt_value *value_obj = NULL;
struct bt_value *attr_field_obj = NULL;
- if (!attr_obj || !name) {
- BT_LOGW("Invalid parameter: attributes object or name is NULL: "
- "value-addr=%p, name-addr=%p", attr_obj, name);
- goto end;
- }
-
+ BT_ASSERT_DBG(attr_obj);
+ BT_ASSERT_DBG(name);
attr_field_obj = bt_attributes_borrow_field_by_name(attr_obj, name);
if (!attr_field_obj) {
BT_LOGD("Cannot find attributes object's field by name: "
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: "
- "value-addr=%p, index=%" PRIu64, attr_field_obj,
- (uint64_t) BT_ATTR_VALUE_INDEX);
- }
end:
return value_obj;
BT_HIDDEN
int bt_attributes_freeze(const struct bt_value *attr_obj)
{
- uint64_t i;
- int64_t count;
+ uint64_t i, count;
int ret = 0;
- if (!attr_obj) {
- BT_LOGW_STR("Invalid parameter: attributes object is NULL.");
- ret = -1;
- goto end;
- }
-
+ BT_ASSERT(attr_obj);
BT_LOGD("Freezing attributes object: value-addr=%p", attr_obj);
- count = bt_value_array_get_size(attr_obj);
- BT_ASSERT(count >= 0);
+
+ count = bt_value_array_get_length(attr_obj);
/*
* We do not freeze the array value object itself here, since
obj = bt_attributes_borrow_field_value(
(void *) attr_obj, i);
if (!obj) {
- BT_LOGE("Cannot get attributes object's field value by index: "
- "value-addr=%p, index=%" PRIu64,
+ BT_LIB_LOGE_APPEND_CAUSE(
+ "Cannot get attributes object's field value by index: "
+ "%![value-]+v, index=%" PRIu64,
attr_obj, i);
ret = -1;
goto end;
projects / babeltrace.git / blobdiff