#include <string.h>
#include <inttypes.h>
#include <babeltrace/compiler-internal.h>
-#include <babeltrace/ref.h>
+#include <babeltrace/object.h>
#include <babeltrace/values.h>
#include <babeltrace/compat/glib-internal.h>
#include <babeltrace/types.h>
#define BT_VALUE_FROM_CONCRETE(_concrete) ((struct bt_value *) (_concrete))
#define BT_VALUE_TO_BOOL(_base) ((struct bt_value_bool *) (_base))
#define BT_VALUE_TO_INTEGER(_base) ((struct bt_value_integer *) (_base))
-#define BT_VALUE_TO_FLOAT(_base) ((struct bt_value_float *) (_base))
+#define BT_VALUE_TO_REAL(_base) ((struct bt_value_real *) (_base))
#define BT_VALUE_TO_STRING(_base) ((struct bt_value_string *) (_base))
#define BT_VALUE_TO_ARRAY(_base) ((struct bt_value_array *) (_base))
#define BT_VALUE_TO_MAP(_base) ((struct bt_value_map *) (_base))
(_value))
#define BT_ASSERT_PRE_VALUE_HOT(_value, _name) \
- BT_ASSERT_PRE_HOT((_value), (_name), ": +%!+v", (_value))
+ BT_ASSERT_PRE_HOT((_value), (_name), ": %!+v", (_value))
#define BT_ASSERT_PRE_VALUE_INDEX_IN_BOUNDS(_index, _count) \
BT_ASSERT_PRE((_index) < (_count), \
bt_bool frozen;
};
+static
+void bt_value_null_instance_release_func(struct bt_object *obj)
+{
+ BT_LOGW("Releasing the null value singleton: addr=%p", obj);
+}
+
static
struct bt_value bt_value_null_instance = {
.base = {
- .ref_count = {
- .count = 1,
- .release = NULL,
- },
- .release = NULL,
- .parent = NULL,
.is_shared = true,
+ .ref_count = 1,
+ .release_func = bt_value_null_instance_release_func,
+ .spec_release_func = NULL,
+ .parent_is_owner_listener_func = NULL,
+ .parent = NULL,
},
.type = BT_VALUE_TYPE_NULL,
.frozen = BT_TRUE,
int64_t value;
};
-struct bt_value_float {
+struct bt_value_real {
struct bt_value base;
double value;
};
[BT_VALUE_TYPE_NULL] = NULL,
[BT_VALUE_TYPE_BOOL] = NULL,
[BT_VALUE_TYPE_INTEGER] = NULL,
- [BT_VALUE_TYPE_FLOAT] = NULL,
+ [BT_VALUE_TYPE_REAL] = NULL,
[BT_VALUE_TYPE_STRING] = bt_value_string_destroy,
[BT_VALUE_TYPE_ARRAY] = bt_value_array_destroy,
[BT_VALUE_TYPE_MAP] = bt_value_map_destroy,
}
static
-struct bt_value *bt_value_float_copy(const struct bt_value *float_obj)
+struct bt_value *bt_value_real_copy(const struct bt_value *real_obj)
{
- return bt_value_float_create_init(
- BT_VALUE_TO_FLOAT(float_obj)->value);
+ return bt_value_real_create_init(
+ BT_VALUE_TO_REAL(real_obj)->value);
}
static
for (i = 0; i < typed_array_obj->garray->len; ++i) {
struct bt_value *element_obj_copy;
- struct bt_value *element_obj = bt_value_array_borrow(
+ struct bt_value *element_obj = bt_value_array_borrow_element_by_index(
array_obj, i);
BT_ASSERT(element_obj);
BT_LOGE("Cannot copy array value's element: "
"array-addr=%p, index=%d",
array_obj, i);
- BT_PUT(copy_obj);
+ BT_OBJECT_PUT_REF_AND_RESET(copy_obj);
goto end;
}
- ret = bt_value_array_append(copy_obj, element_obj_copy);
- BT_PUT(element_obj_copy);
+ ret = bt_value_array_append_element(copy_obj, element_obj_copy);
+ BT_OBJECT_PUT_REF_AND_RESET(element_obj_copy);
if (ret) {
BT_LOGE("Cannot append to array value: addr=%p",
array_obj);
- BT_PUT(copy_obj);
+ BT_OBJECT_PUT_REF_AND_RESET(copy_obj);
goto end;
}
}
BT_LOGE("Cannot copy map value's element: "
"map-addr=%p, key=\"%s\"",
map_obj, key_str);
- BT_PUT(copy_obj);
+ BT_OBJECT_PUT_REF_AND_RESET(copy_obj);
goto end;
}
- ret = bt_value_map_insert(copy_obj, key_str, element_obj_copy);
- BT_PUT(element_obj_copy);
+ ret = bt_value_map_insert_entry(copy_obj, key_str, element_obj_copy);
+ BT_OBJECT_PUT_REF_AND_RESET(element_obj_copy);
if (ret) {
BT_LOGE("Cannot insert into map value: addr=%p, key=\"%s\"",
map_obj, key_str);
- BT_PUT(copy_obj);
+ BT_OBJECT_PUT_REF_AND_RESET(copy_obj);
goto end;
}
}
[BT_VALUE_TYPE_NULL] = bt_value_null_copy,
[BT_VALUE_TYPE_BOOL] = bt_value_bool_copy,
[BT_VALUE_TYPE_INTEGER] = bt_value_integer_copy,
- [BT_VALUE_TYPE_FLOAT] = bt_value_float_copy,
+ [BT_VALUE_TYPE_REAL] = bt_value_real_copy,
[BT_VALUE_TYPE_STRING] = bt_value_string_copy,
[BT_VALUE_TYPE_ARRAY] = bt_value_array_copy,
[BT_VALUE_TYPE_MAP] = bt_value_map_copy,
}
static
-bt_bool bt_value_float_compare(const struct bt_value *object_a,
+bt_bool bt_value_real_compare(const struct bt_value *object_a,
const struct bt_value *object_b)
{
- if (BT_VALUE_TO_FLOAT(object_a)->value !=
- BT_VALUE_TO_FLOAT(object_b)->value) {
- BT_LOGV("Floating point number value objects are different: "
- "float-a-val=%f, float-b-val=%f",
- BT_VALUE_TO_FLOAT(object_a)->value,
- BT_VALUE_TO_FLOAT(object_b)->value);
+ if (BT_VALUE_TO_REAL(object_a)->value !=
+ BT_VALUE_TO_REAL(object_b)->value) {
+ BT_LOGV("Real number value objects are different: "
+ "real-a-val=%f, real-b-val=%f",
+ BT_VALUE_TO_REAL(object_a)->value,
+ BT_VALUE_TO_REAL(object_b)->value);
return BT_FALSE;
}
const struct bt_value_array *array_obj_a =
BT_VALUE_TO_ARRAY(object_a);
- if (bt_value_array_size(object_a) != bt_value_array_size(object_b)) {
+ if (bt_value_array_get_size(object_a) != bt_value_array_get_size(object_b)) {
BT_LOGV("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_value_array_size(object_a),
- bt_value_array_size(object_b));
+ bt_value_array_get_size(object_a),
+ bt_value_array_get_size(object_b));
ret = BT_FALSE;
goto end;
}
struct bt_value *element_obj_a;
struct bt_value *element_obj_b;
- element_obj_a = bt_value_array_borrow(object_a, i);
- element_obj_b = bt_value_array_borrow(object_b, i);
+ element_obj_a = bt_value_array_borrow_element_by_index(object_a, i);
+ element_obj_b = bt_value_array_borrow_element_by_index(object_b, i);
if (!bt_value_compare(element_obj_a, element_obj_b)) {
BT_LOGV("Array values's elements are different: "
gpointer key, element_obj_a;
const struct bt_value_map *map_obj_a = BT_VALUE_TO_MAP(object_a);
- if (bt_value_map_size(object_a) != bt_value_map_size(object_b)) {
+ if (bt_value_map_get_size(object_a) != bt_value_map_get_size(object_b)) {
BT_LOGV("Map 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_value_map_size(object_a),
- bt_value_map_size(object_b));
+ bt_value_map_get_size(object_a),
+ bt_value_map_get_size(object_b));
ret = BT_FALSE;
goto end;
}
struct bt_value *element_obj_b;
const char *key_str = g_quark_to_string(GPOINTER_TO_UINT(key));
- element_obj_b = bt_value_map_borrow(object_b, key_str);
+ element_obj_b = bt_value_map_borrow_entry_value(object_b, key_str);
if (!bt_value_compare(element_obj_a, element_obj_b)) {
BT_LOGV("Map values's elements are different: "
[BT_VALUE_TYPE_NULL] = bt_value_null_compare,
[BT_VALUE_TYPE_BOOL] = bt_value_bool_compare,
[BT_VALUE_TYPE_INTEGER] = bt_value_integer_compare,
- [BT_VALUE_TYPE_FLOAT] = bt_value_float_compare,
+ [BT_VALUE_TYPE_REAL] = bt_value_real_compare,
[BT_VALUE_TYPE_STRING] = bt_value_string_compare,
[BT_VALUE_TYPE_ARRAY] = bt_value_array_compare,
[BT_VALUE_TYPE_MAP] = bt_value_map_compare,
[BT_VALUE_TYPE_NULL] = bt_value_null_freeze,
[BT_VALUE_TYPE_BOOL] = bt_value_generic_freeze,
[BT_VALUE_TYPE_INTEGER] = bt_value_generic_freeze,
- [BT_VALUE_TYPE_FLOAT] = bt_value_generic_freeze,
+ [BT_VALUE_TYPE_REAL] = bt_value_generic_freeze,
[BT_VALUE_TYPE_STRING] = bt_value_generic_freeze,
[BT_VALUE_TYPE_ARRAY] = bt_value_array_freeze,
[BT_VALUE_TYPE_MAP] = bt_value_map_freeze,
struct bt_value *value;
value = container_of(obj, struct bt_value, base);
- BT_ASSERT(value->type != BT_VALUE_TYPE_UNKNOWN);
BT_LOGD("Destroying value: addr=%p", value);
if (bt_value_is_null(value)) {
static
struct bt_value bt_value_create_base(enum bt_value_type type)
{
- struct bt_value base;
+ struct bt_value value;
- base.type = type;
- base.frozen = BT_FALSE;
- bt_object_init(&base, bt_value_destroy);
- return base;
+ value.type = type;
+ value.frozen = BT_FALSE;
+ bt_object_init_shared(&value.base, bt_value_destroy);
+ return value;
}
struct bt_value *bt_value_bool_create_init(bt_bool val)
return bt_value_integer_create_init(0);
}
-struct bt_value *bt_value_float_create_init(double val)
+struct bt_value *bt_value_real_create_init(double val)
{
- struct bt_value_float *float_obj;
+ struct bt_value_real *real_obj;
- BT_LOGD("Creating floating point number value object: val=%f", val);
- float_obj = g_new0(struct bt_value_float, 1);
- if (!float_obj) {
- BT_LOGE_STR("Failed to allocate one floating point number value object.");
+ BT_LOGD("Creating real number value object: val=%f", val);
+ real_obj = g_new0(struct bt_value_real, 1);
+ if (!real_obj) {
+ BT_LOGE_STR("Failed to allocate one real number value object.");
goto end;
}
- float_obj->base = bt_value_create_base(BT_VALUE_TYPE_FLOAT);
- float_obj->value = val;
- BT_LOGD("Created floating point number value object: addr=%p",
- float_obj);
+ real_obj->base = bt_value_create_base(BT_VALUE_TYPE_REAL);
+ real_obj->value = val;
+ BT_LOGD("Created real number value object: addr=%p",
+ real_obj);
end:
- return BT_VALUE_FROM_CONCRETE(float_obj);
+ return BT_VALUE_FROM_CONCRETE(real_obj);
}
-struct bt_value *bt_value_float_create(void)
+struct bt_value *bt_value_real_create(void)
{
- return bt_value_float_create_init(0.);
+ return bt_value_real_create_init(0.);
}
struct bt_value *bt_value_string_create_init(const char *val)
array_obj->base = bt_value_create_base(BT_VALUE_TYPE_ARRAY);
array_obj->garray = bt_g_ptr_array_new_full(0,
- (GDestroyNotify) bt_put);
+ (GDestroyNotify) bt_object_put_ref);
if (!array_obj->garray) {
BT_LOGE_STR("Failed to allocate a GPtrArray.");
g_free(array_obj);
map_obj->base = bt_value_create_base(BT_VALUE_TYPE_MAP);
map_obj->ght = g_hash_table_new_full(g_direct_hash, g_direct_equal,
- NULL, (GDestroyNotify) bt_put);
+ NULL, (GDestroyNotify) bt_object_put_ref);
if (!map_obj->ght) {
BT_LOGE_STR("Failed to allocate a GHashTable.");
g_free(map_obj);
return BT_VALUE_STATUS_OK;
}
-enum bt_value_status bt_value_float_get(const struct bt_value *float_obj,
+enum bt_value_status bt_value_real_get(const struct bt_value *real_obj,
double *val)
{
- BT_ASSERT_PRE_NON_NULL(float_obj, "Value object");
+ BT_ASSERT_PRE_NON_NULL(real_obj, "Value object");
BT_ASSERT_PRE_NON_NULL(val, "Raw value");
- BT_ASSERT_PRE_VALUE_IS_TYPE(float_obj, BT_VALUE_TYPE_FLOAT);
- *val = BT_VALUE_TO_FLOAT(float_obj)->value;
+ BT_ASSERT_PRE_VALUE_IS_TYPE(real_obj, BT_VALUE_TYPE_REAL);
+ *val = BT_VALUE_TO_REAL(real_obj)->value;
return BT_VALUE_STATUS_OK;
}
-enum bt_value_status bt_value_float_set(struct bt_value *float_obj,
+enum bt_value_status bt_value_real_set(struct bt_value *real_obj,
double val)
{
- BT_ASSERT_PRE_NON_NULL(float_obj, "Value object");
- BT_ASSERT_PRE_VALUE_IS_TYPE(float_obj, BT_VALUE_TYPE_FLOAT);
- BT_ASSERT_PRE_VALUE_HOT(float_obj, "Value object");
- BT_VALUE_TO_FLOAT(float_obj)->value = val;
- BT_LOGV("Set floating point number value's raw value: value-addr=%p, value=%f",
- float_obj, val);
+ BT_ASSERT_PRE_NON_NULL(real_obj, "Value object");
+ BT_ASSERT_PRE_VALUE_IS_TYPE(real_obj, BT_VALUE_TYPE_REAL);
+ BT_ASSERT_PRE_VALUE_HOT(real_obj, "Value object");
+ BT_VALUE_TO_REAL(real_obj)->value = val;
+ BT_LOGV("Set real number value's raw value: value-addr=%p, value=%f",
+ real_obj, val);
return BT_VALUE_STATUS_OK;
}
return BT_VALUE_STATUS_OK;
}
-int64_t bt_value_array_size(const struct bt_value *array_obj)
+int64_t bt_value_array_get_size(const struct bt_value *array_obj)
{
BT_ASSERT_PRE_NON_NULL(array_obj, "Value object");
BT_ASSERT_PRE_VALUE_IS_TYPE(array_obj, BT_VALUE_TYPE_ARRAY);
bt_bool bt_value_array_is_empty(const struct bt_value *array_obj)
{
- return bt_value_array_size(array_obj) == 0;
+ return bt_value_array_get_size(array_obj) == 0;
}
-struct bt_value *bt_value_array_borrow(const struct bt_value *array_obj,
+struct bt_value *bt_value_array_borrow_element_by_index(const struct bt_value *array_obj,
uint64_t index)
{
struct bt_value_array *typed_array_obj =
return g_ptr_array_index(typed_array_obj->garray, index);
}
-enum bt_value_status bt_value_array_append(struct bt_value *array_obj,
+enum bt_value_status bt_value_array_append_element(struct bt_value *array_obj,
struct bt_value *element_obj)
{
struct bt_value_array *typed_array_obj =
BT_ASSERT_PRE_VALUE_IS_TYPE(array_obj, BT_VALUE_TYPE_ARRAY);
BT_ASSERT_PRE_VALUE_HOT(array_obj, "Array value object");
g_ptr_array_add(typed_array_obj->garray, element_obj);
- bt_get(element_obj);
+ bt_object_get_ref(element_obj);
BT_LOGV("Appended element to array value: array-value-addr=%p, "
"element-value-addr=%p, new-size=%u",
array_obj, element_obj, typed_array_obj->garray->len);
return BT_VALUE_STATUS_OK;
}
-enum bt_value_status bt_value_array_append_bool(struct bt_value *array_obj,
+enum bt_value_status bt_value_array_append_bool_element(struct bt_value *array_obj,
bt_bool val)
{
enum bt_value_status ret;
struct bt_value *bool_obj = NULL;
bool_obj = bt_value_bool_create_init(val);
- ret = bt_value_array_append(array_obj, bool_obj);
- bt_put(bool_obj);
+ ret = bt_value_array_append_element(array_obj, bool_obj);
+ bt_object_put_ref(bool_obj);
return ret;
}
-enum bt_value_status bt_value_array_append_integer(
+enum bt_value_status bt_value_array_append_integer_element(
struct bt_value *array_obj, int64_t val)
{
enum bt_value_status ret;
struct bt_value *integer_obj = NULL;
integer_obj = bt_value_integer_create_init(val);
- ret = bt_value_array_append(array_obj, integer_obj);
- bt_put(integer_obj);
+ ret = bt_value_array_append_element(array_obj, integer_obj);
+ bt_object_put_ref(integer_obj);
return ret;
}
-enum bt_value_status bt_value_array_append_float(struct bt_value *array_obj,
+enum bt_value_status bt_value_array_append_real_element(struct bt_value *array_obj,
double val)
{
enum bt_value_status ret;
- struct bt_value *float_obj = NULL;
+ struct bt_value *real_obj = NULL;
- float_obj = bt_value_float_create_init(val);
- ret = bt_value_array_append(array_obj, float_obj);
- bt_put(float_obj);
+ real_obj = bt_value_real_create_init(val);
+ ret = bt_value_array_append_element(array_obj, real_obj);
+ bt_object_put_ref(real_obj);
return ret;
}
-enum bt_value_status bt_value_array_append_string(struct bt_value *array_obj,
+enum bt_value_status bt_value_array_append_string_element(struct bt_value *array_obj,
const char *val)
{
enum bt_value_status ret;
struct bt_value *string_obj = NULL;
string_obj = bt_value_string_create_init(val);
- ret = bt_value_array_append(array_obj, string_obj);
- bt_put(string_obj);
+ ret = bt_value_array_append_element(array_obj, string_obj);
+ bt_object_put_ref(string_obj);
return ret;
}
-enum bt_value_status bt_value_array_append_empty_array(
+enum bt_value_status bt_value_array_append_empty_array_element(
struct bt_value *array_obj)
{
enum bt_value_status ret;
struct bt_value *empty_array_obj = NULL;
empty_array_obj = bt_value_array_create();
- ret = bt_value_array_append(array_obj, empty_array_obj);
- bt_put(empty_array_obj);
+ ret = bt_value_array_append_element(array_obj, empty_array_obj);
+ bt_object_put_ref(empty_array_obj);
return ret;
}
-enum bt_value_status bt_value_array_append_empty_map(struct bt_value *array_obj)
+enum bt_value_status bt_value_array_append_empty_map_element(struct bt_value *array_obj)
{
enum bt_value_status ret;
struct bt_value *map_obj = NULL;
map_obj = bt_value_map_create();
- ret = bt_value_array_append(array_obj, map_obj);
- bt_put(map_obj);
+ ret = bt_value_array_append_element(array_obj, map_obj);
+ bt_object_put_ref(map_obj);
return ret;
}
-enum bt_value_status bt_value_array_set(struct bt_value *array_obj,
+enum bt_value_status bt_value_array_set_element_by_index(struct bt_value *array_obj,
uint64_t index, struct bt_value *element_obj)
{
struct bt_value_array *typed_array_obj =
BT_ASSERT_PRE_VALUE_HOT(array_obj, "Array value object");
BT_ASSERT_PRE_VALUE_INDEX_IN_BOUNDS(index,
typed_array_obj->garray->len);
- bt_put(g_ptr_array_index(typed_array_obj->garray, index));
+ bt_object_put_ref(g_ptr_array_index(typed_array_obj->garray, index));
g_ptr_array_index(typed_array_obj->garray, index) = element_obj;
- bt_get(element_obj);
+ bt_object_get_ref(element_obj);
BT_LOGV("Set array value's element: array-value-addr=%p, "
"index=%" PRIu64 ", element-value-addr=%p",
array_obj, index, element_obj);
return BT_VALUE_STATUS_OK;
}
-int64_t bt_value_map_size(const struct bt_value *map_obj)
+int64_t bt_value_map_get_size(const struct bt_value *map_obj)
{
BT_ASSERT_PRE_NON_NULL(map_obj, "Value object");
BT_ASSERT_PRE_VALUE_IS_TYPE(map_obj, BT_VALUE_TYPE_MAP);
bt_bool bt_value_map_is_empty(const struct bt_value *map_obj)
{
- return bt_value_map_size(map_obj) == 0;
+ return bt_value_map_get_size(map_obj) == 0;
}
-struct bt_value *bt_value_map_borrow(const struct bt_value *map_obj,
+struct bt_value *bt_value_map_borrow_entry_value(const struct bt_value *map_obj,
const char *key)
{
BT_ASSERT_PRE_NON_NULL(map_obj, "Value object");
GUINT_TO_POINTER(g_quark_from_string(key)));
}
-bt_bool bt_value_map_has_key(const struct bt_value *map_obj, const char *key)
+bt_bool bt_value_map_has_entry(const struct bt_value *map_obj, const char *key)
{
BT_ASSERT_PRE_NON_NULL(map_obj, "Value object");
BT_ASSERT_PRE_NON_NULL(key, "Key");
GUINT_TO_POINTER(g_quark_from_string(key)));
}
-enum bt_value_status bt_value_map_insert(struct bt_value *map_obj,
+enum bt_value_status bt_value_map_insert_entry(struct bt_value *map_obj,
const char *key, struct bt_value *element_obj)
{
BT_ASSERT_PRE_NON_NULL(map_obj, "Map value object");
BT_ASSERT_PRE_VALUE_HOT(map_obj, "Map value object");
g_hash_table_insert(BT_VALUE_TO_MAP(map_obj)->ght,
GUINT_TO_POINTER(g_quark_from_string(key)), element_obj);
- bt_get(element_obj);
+ bt_object_get_ref(element_obj);
BT_LOGV("Inserted value into map value: map-value-addr=%p, "
"key=\"%s\", element-value-addr=%p",
map_obj, key, element_obj);
return BT_VALUE_STATUS_OK;
}
-enum bt_value_status bt_value_map_insert_bool(struct bt_value *map_obj,
+enum bt_value_status bt_value_map_insert_bool_entry(struct bt_value *map_obj,
const char *key, bt_bool val)
{
enum bt_value_status ret;
struct bt_value *bool_obj = NULL;
bool_obj = bt_value_bool_create_init(val);
- ret = bt_value_map_insert(map_obj, key, bool_obj);
- bt_put(bool_obj);
+ ret = bt_value_map_insert_entry(map_obj, key, bool_obj);
+ bt_object_put_ref(bool_obj);
return ret;
}
-enum bt_value_status bt_value_map_insert_integer(struct bt_value *map_obj,
+enum bt_value_status bt_value_map_insert_integer_entry(struct bt_value *map_obj,
const char *key, int64_t val)
{
enum bt_value_status ret;
struct bt_value *integer_obj = NULL;
integer_obj = bt_value_integer_create_init(val);
- ret = bt_value_map_insert(map_obj, key, integer_obj);
- bt_put(integer_obj);
+ ret = bt_value_map_insert_entry(map_obj, key, integer_obj);
+ bt_object_put_ref(integer_obj);
return ret;
}
-enum bt_value_status bt_value_map_insert_float(struct bt_value *map_obj,
+enum bt_value_status bt_value_map_insert_real_entry(struct bt_value *map_obj,
const char *key, double val)
{
enum bt_value_status ret;
- struct bt_value *float_obj = NULL;
+ struct bt_value *real_obj = NULL;
- float_obj = bt_value_float_create_init(val);
- ret = bt_value_map_insert(map_obj, key, float_obj);
- bt_put(float_obj);
+ real_obj = bt_value_real_create_init(val);
+ ret = bt_value_map_insert_entry(map_obj, key, real_obj);
+ bt_object_put_ref(real_obj);
return ret;
}
-enum bt_value_status bt_value_map_insert_string(struct bt_value *map_obj,
+enum bt_value_status bt_value_map_insert_string_entry(struct bt_value *map_obj,
const char *key, const char *val)
{
enum bt_value_status ret;
struct bt_value *string_obj = NULL;
string_obj = bt_value_string_create_init(val);
- ret = bt_value_map_insert(map_obj, key, string_obj);
- bt_put(string_obj);
+ ret = bt_value_map_insert_entry(map_obj, key, string_obj);
+ bt_object_put_ref(string_obj);
return ret;
}
-enum bt_value_status bt_value_map_insert_empty_array(struct bt_value *map_obj,
+enum bt_value_status bt_value_map_insert_empty_array_entry(struct bt_value *map_obj,
const char *key)
{
enum bt_value_status ret;
struct bt_value *array_obj = NULL;
array_obj = bt_value_array_create();
- ret = bt_value_map_insert(map_obj, key, array_obj);
- bt_put(array_obj);
+ ret = bt_value_map_insert_entry(map_obj, key, array_obj);
+ bt_object_put_ref(array_obj);
return ret;
}
-enum bt_value_status bt_value_map_insert_empty_map(struct bt_value *map_obj,
+enum bt_value_status bt_value_map_insert_empty_map_entry(struct bt_value *map_obj,
const char *key)
{
enum bt_value_status ret;
struct bt_value *empty_map_obj = NULL;
empty_map_obj = bt_value_map_create();
- ret = bt_value_map_insert(map_obj, key, empty_map_obj);
- bt_put(empty_map_obj);
+ ret = bt_value_map_insert_entry(map_obj, key, empty_map_obj);
+ bt_object_put_ref(empty_map_obj);
return ret;
}
-enum bt_value_status bt_value_map_foreach(const struct bt_value *map_obj,
- bt_value_map_foreach_cb cb, void *data)
+enum bt_value_status bt_value_map_foreach_entry(const struct bt_value *map_obj,
+ bt_value_map_foreach_entry_cb cb, void *data)
{
enum bt_value_status ret = BT_VALUE_STATUS_OK;
gpointer key, element_obj;
bt_value_copy(extension_obj_elem);
/* Replace in extended object */
- if (bt_value_map_insert(extend_data->extended_obj, key,
+ if (bt_value_map_insert_entry(extend_data->extended_obj, key,
extension_obj_elem_copy)) {
BT_LOGE("Cannot replace value in extended value: key=\"%s\", "
"extended-value-addr=%p, element-value-addr=%p",
extend_data->got_error = BT_TRUE;
end:
- BT_PUT(extension_obj_elem_copy);
+ BT_OBJECT_PUT_REF_AND_RESET(extension_obj_elem_copy);
return ret;
}
*/
extend_data.extended_obj = extended_obj;
- if (bt_value_map_foreach(extension_obj, extend_map_element,
+ if (bt_value_map_foreach_entry(extension_obj, extend_map_element,
&extend_data)) {
BT_LOGE("Cannot iterate on the extension object's elements: "
"extension-value-addr=%p", extension_obj);
goto end;
error:
- BT_PUT(extended_obj);
+ BT_OBJECT_PUT_REF_AND_RESET(extended_obj);
end:
return extended_obj;
projects / babeltrace.git / blobdiff