X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fvalue.c;h=c8865ebc05c2d37eb451a3ccbb6bf1acdd920073;hb=6871026b82224d83bb63cbb44cc33c16c766d96d;hp=a288dc54fd9b2d0ce544a9ed870ee2ee34c95ba0;hpb=c2d9d9cf280189e77453e82e4979c307eef111e7;p=babeltrace.git diff --git a/src/lib/value.c b/src/lib/value.c index a288dc54..c8865ebc 100644 --- a/src/lib/value.c +++ b/src/lib/value.c @@ -27,15 +27,15 @@ #include #include #include +#include + #include "compat/compiler.h" #include "common/common.h" -#include -#include #include "compat/glib.h" -#include #include "lib/assert-pre.h" #include "lib/value.h" #include "common/assert.h" +#include "func-status.h" #define BT_VALUE_TO_BOOL(_base) ((struct bt_value_bool *) (_base)) #define BT_VALUE_TO_INTEGER(_base) ((struct bt_value_integer *) (_base)) @@ -44,20 +44,27 @@ #define BT_VALUE_TO_ARRAY(_base) ((struct bt_value_array *) (_base)) #define BT_VALUE_TO_MAP(_base) ((struct bt_value_map *) (_base)) -#define BT_ASSERT_PRE_VALUE_IS_TYPE(_value, _type) \ - BT_ASSERT_PRE(((struct bt_value *) (_value))->type == (_type), \ - "Value has the wrong type ID: expected-type=%s, " \ - "%![value-]+v", bt_common_value_type_string(_type), \ - (_value)) +#define _BT_ASSERT_PRE_VALUE_IS_TYPE_COND(_value, _type) \ + (((struct bt_value *) (_value))->type == (_type)) -#define BT_ASSERT_PRE_VALUE_HOT(_value, _name) \ - BT_ASSERT_PRE_HOT(((struct bt_value *) (_value)), (_name), \ - ": %!+v", (_value)) +#define _BT_ASSERT_PRE_VALUE_IS_TYPE_FMT \ + "Value has the wrong type ID: expected-type=%s, %![value-]+v" -#define BT_ASSERT_PRE_VALUE_INDEX_IN_BOUNDS(_index, _count) \ - BT_ASSERT_PRE((_index) < (_count), \ - "Index is out of bound: " \ - "index=%" PRIu64 ", count=%u", (_index), (_count)); +#define BT_ASSERT_PRE_VALUE_IS_TYPE(_value, _type) \ + BT_ASSERT_PRE( \ + _BT_ASSERT_PRE_VALUE_IS_TYPE_COND((_value), (_type)), \ + _BT_ASSERT_PRE_VALUE_IS_TYPE_FMT, \ + bt_common_value_type_string(_type), (_value)) + +#define BT_ASSERT_PRE_DEV_VALUE_IS_TYPE(_value, _type) \ + BT_ASSERT_PRE_DEV( \ + _BT_ASSERT_PRE_VALUE_IS_TYPE_COND((_value), (_type)), \ + _BT_ASSERT_PRE_VALUE_IS_TYPE_FMT, \ + bt_common_value_type_string(_type), (_value)) + +#define BT_ASSERT_PRE_DEV_VALUE_HOT(_value, _name) \ + BT_ASSERT_PRE_DEV_HOT(((struct bt_value *) (_value)), (_name), \ + ": %!+v", (_value)) static void bt_value_null_instance_release_func(struct bt_object *obj) @@ -129,6 +136,9 @@ void (* const destroy_funcs[])(struct bt_value *) = { static struct bt_value *bt_value_null_copy(const struct bt_value *null_obj) { + BT_ASSERT(null_obj == bt_value_null); + + bt_object_get_ref_no_null_check(bt_value_null); return (void *) bt_value_null; } @@ -177,7 +187,7 @@ struct bt_value *bt_value_array_copy(const struct bt_value *array_obj) typed_array_obj = BT_VALUE_TO_ARRAY(array_obj); copy_obj = bt_value_array_create(); if (!copy_obj) { - BT_LOGE_STR("Cannot create empty array value."); + BT_LIB_LOGE_APPEND_CAUSE("Cannot create empty array value."); goto end; } @@ -192,7 +202,8 @@ struct bt_value *bt_value_array_copy(const struct bt_value *array_obj) "index=%d", element_obj, i); ret = bt_value_copy(element_obj, &element_obj_copy); if (ret) { - BT_LOGE("Cannot copy array value's element: " + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot copy array value's element: " "array-addr=%p, index=%d", array_obj, i); BT_OBJECT_PUT_REF_AND_RESET(copy_obj); @@ -204,7 +215,8 @@ struct bt_value *bt_value_array_copy(const struct bt_value *array_obj) (void *) element_obj_copy); BT_OBJECT_PUT_REF_AND_RESET(element_obj_copy); if (ret) { - BT_LOGE("Cannot append to array value: addr=%p", + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot append to array value: addr=%p", array_obj); BT_OBJECT_PUT_REF_AND_RESET(copy_obj); goto end; @@ -245,7 +257,8 @@ struct bt_value *bt_value_map_copy(const struct bt_value *map_obj) "key=\"%s\"", element_obj, key_str); ret = bt_value_copy(element_obj, &element_obj_copy); if (ret) { - BT_LOGE("Cannot copy map value's element: " + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot copy map value's element: " "map-addr=%p, key=\"%s\"", map_obj, key_str); BT_OBJECT_PUT_REF_AND_RESET(copy_obj); @@ -257,7 +270,8 @@ struct bt_value *bt_value_map_copy(const struct bt_value *map_obj) (void *) 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\"", + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot insert into map value: addr=%p, key=\"%s\"", map_obj, key_str); BT_OBJECT_PUT_REF_AND_RESET(copy_obj); goto end; @@ -300,7 +314,7 @@ bt_bool bt_value_bool_compare(const struct bt_value *object_a, { if (BT_VALUE_TO_BOOL(object_a)->value != BT_VALUE_TO_BOOL(object_b)->value) { - BT_LOGV("Boolean value objects are different: " + BT_LOGT("Boolean value objects are different: " "bool-a-val=%d, bool-b-val=%d", BT_VALUE_TO_BOOL(object_a)->value, BT_VALUE_TO_BOOL(object_b)->value); @@ -317,12 +331,12 @@ bt_bool bt_value_integer_compare(const struct bt_value *object_a, if (BT_VALUE_TO_INTEGER(object_a)->value.u != BT_VALUE_TO_INTEGER(object_b)->value.u) { if (object_a->type == BT_VALUE_TYPE_UNSIGNED_INTEGER) { - BT_LOGV("Unsigned integer value objects are different: " + BT_LOGT("Unsigned integer value objects are different: " "int-a-val=%" PRIu64 ", int-b-val=%" PRIu64, BT_VALUE_TO_INTEGER(object_a)->value.u, BT_VALUE_TO_INTEGER(object_b)->value.u); } else { - BT_LOGV("Signed integer value objects are different: " + BT_LOGT("Signed integer value objects are different: " "int-a-val=%" PRId64 ", int-b-val=%" PRId64, BT_VALUE_TO_INTEGER(object_a)->value.i, BT_VALUE_TO_INTEGER(object_b)->value.i); @@ -340,7 +354,7 @@ bt_bool bt_value_real_compare(const struct bt_value *object_a, { if (BT_VALUE_TO_REAL(object_a)->value != BT_VALUE_TO_REAL(object_b)->value) { - BT_LOGV("Real number value objects are different: " + BT_LOGT("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); @@ -356,7 +370,7 @@ bt_bool bt_value_string_compare(const struct bt_value *object_a, { if (strcmp(BT_VALUE_TO_STRING(object_a)->gstr->str, BT_VALUE_TO_STRING(object_b)->gstr->str) != 0) { - BT_LOGV("String value objects are different: " + BT_LOGT("String value objects are different: " "string-a-val=\"%s\", string-b-val=\"%s\"", BT_VALUE_TO_STRING(object_a)->gstr->str, BT_VALUE_TO_STRING(object_b)->gstr->str); @@ -375,14 +389,14 @@ bt_bool bt_value_array_compare(const struct bt_value *object_a, const struct bt_value_array *array_obj_a = BT_VALUE_TO_ARRAY(object_a); - if (bt_value_array_get_size(object_a) != - bt_value_array_get_size(object_b)) { - BT_LOGV("Array values are different: size mismatch " + if (bt_value_array_get_length(object_a) != + bt_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_value_array_get_size(object_a), - bt_value_array_get_size(object_b)); + bt_value_array_get_length(object_a), + bt_value_array_get_length(object_b)); ret = BT_FALSE; goto end; } @@ -397,7 +411,7 @@ bt_bool bt_value_array_compare(const struct bt_value *object_a, object_b, i); if (!bt_value_compare(element_obj_a, element_obj_b)) { - BT_LOGV("Array values's elements are different: " + BT_LOGT("Array values's elements are different: " "value-a-addr=%p, value-b-addr=%p, index=%d", element_obj_a, element_obj_b, i); ret = BT_FALSE; @@ -420,7 +434,7 @@ bt_bool bt_value_map_compare(const struct bt_value *object_a, if (bt_value_map_get_size(object_a) != bt_value_map_get_size(object_b)) { - BT_LOGV("Map values are different: size mismatch " + BT_LOGT("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, @@ -440,7 +454,7 @@ bt_bool bt_value_map_compare(const struct bt_value *object_a, key_str); if (!bt_value_compare(element_obj_a, element_obj_b)) { - BT_LOGV("Map values's elements are different: " + BT_LOGT("Map values's elements are different: " "value-a-addr=%p, value-b-addr=%p, key=\"%s\"", element_obj_a, element_obj_b, key_str); ret = BT_FALSE; @@ -539,10 +553,9 @@ void bt_value_destroy(struct bt_object *obj) } BT_HIDDEN -enum bt_value_status _bt_value_freeze(const struct bt_value *c_object) +void _bt_value_freeze(const struct bt_value *c_object) { const struct bt_value *object = (void *) c_object; - enum bt_value_status ret = BT_VALUE_STATUS_OK; BT_ASSERT(object); @@ -554,12 +567,12 @@ enum bt_value_status _bt_value_freeze(const struct bt_value *c_object) freeze_funcs[object->type]((void *) object); end: - return ret; + return; } enum bt_value_type bt_value_get_type(const struct bt_value *object) { - BT_ASSERT_PRE_NON_NULL(object, "Value object"); + BT_ASSERT_PRE_DEV_NON_NULL(object, "Value object"); return object->type; } @@ -581,7 +594,8 @@ struct bt_value *bt_value_bool_create_init(bt_bool val) BT_LOGD("Creating boolean value object: val=%d", val); bool_obj = g_new0(struct bt_value_bool, 1); if (!bool_obj) { - BT_LOGE_STR("Failed to allocate one boolean value object."); + BT_LIB_LOGE_APPEND_CAUSE( + "Failed to allocate one boolean value object."); goto end; } @@ -617,7 +631,8 @@ struct bt_value *bt_value_integer_create_init(enum bt_value_type type, integer_obj = g_new0(struct bt_value_integer, 1); if (!integer_obj) { - BT_LOGE_STR("Failed to allocate one integer value object."); + BT_LIB_LOGE_APPEND_CAUSE( + "Failed to allocate one integer value object."); goto end; } @@ -631,26 +646,26 @@ end: return (void *) integer_obj; } -struct bt_value *bt_value_unsigned_integer_create_init(uint64_t val) +struct bt_value *bt_value_integer_unsigned_create_init(uint64_t val) { return bt_value_integer_create_init(BT_VALUE_TYPE_UNSIGNED_INTEGER, val); } -struct bt_value *bt_value_unsigned_integer_create(void) +struct bt_value *bt_value_integer_unsigned_create(void) { - return bt_value_unsigned_integer_create_init(0); + return bt_value_integer_unsigned_create_init(0); } -struct bt_value *bt_value_signed_integer_create_init(int64_t val) +struct bt_value *bt_value_integer_signed_create_init(int64_t val) { return bt_value_integer_create_init(BT_VALUE_TYPE_SIGNED_INTEGER, (uint64_t) val); } -struct bt_value *bt_value_signed_integer_create(void) +struct bt_value *bt_value_integer_signed_create(void) { - return bt_value_signed_integer_create_init(0); + return bt_value_integer_signed_create_init(0); } struct bt_value *bt_value_real_create_init(double val) @@ -660,7 +675,8 @@ struct bt_value *bt_value_real_create_init(double val) 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."); + BT_LIB_LOGE_APPEND_CAUSE( + "Failed to allocate one real number value object."); goto end; } @@ -682,22 +698,20 @@ struct bt_value *bt_value_string_create_init(const char *val) { struct bt_value_string *string_obj = NULL; - if (!val) { - BT_LOGW_STR("Invalid parameter: value is NULL."); - goto end; - } - + BT_ASSERT_PRE_NON_NULL(val, "Value"); BT_LOGD("Creating string value object: val-len=%zu", strlen(val)); string_obj = g_new0(struct bt_value_string, 1); if (!string_obj) { - BT_LOGE_STR("Failed to allocate one string object."); + BT_LIB_LOGE_APPEND_CAUSE( + "Failed to allocate one string object."); goto end; } string_obj->base = bt_value_create_base(BT_VALUE_TYPE_STRING); string_obj->gstr = g_string_new(val); if (!string_obj->gstr) { - BT_LOGE_STR("Failed to allocate a GString."); + BT_LIB_LOGE_APPEND_CAUSE( + "Failed to allocate a GString."); g_free(string_obj); string_obj = NULL; goto end; @@ -722,7 +736,8 @@ struct bt_value *bt_value_array_create(void) BT_LOGD_STR("Creating empty array value object."); array_obj = g_new0(struct bt_value_array, 1); if (!array_obj) { - BT_LOGE_STR("Failed to allocate one array object."); + BT_LIB_LOGE_APPEND_CAUSE( + "Failed to allocate one array object."); goto end; } @@ -730,7 +745,7 @@ struct bt_value *bt_value_array_create(void) array_obj->garray = bt_g_ptr_array_new_full(0, (GDestroyNotify) bt_object_put_ref); if (!array_obj->garray) { - BT_LOGE_STR("Failed to allocate a GPtrArray."); + BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GPtrArray."); g_free(array_obj); array_obj = NULL; goto end; @@ -750,7 +765,7 @@ struct bt_value *bt_value_map_create(void) BT_LOGD_STR("Creating empty map value object."); map_obj = g_new0(struct bt_value_map, 1); if (!map_obj) { - BT_LOGE_STR("Failed to allocate one map object."); + BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one map object."); goto end; } @@ -758,7 +773,7 @@ struct bt_value *bt_value_map_create(void) map_obj->ght = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, (GDestroyNotify) bt_object_put_ref); if (!map_obj->ght) { - BT_LOGE_STR("Failed to allocate a GHashTable."); + BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GHashTable."); g_free(map_obj); map_obj = NULL; goto end; @@ -773,8 +788,8 @@ end: bt_bool bt_value_bool_get(const struct bt_value *bool_obj) { - BT_ASSERT_PRE_NON_NULL(bool_obj, "Value object"); - BT_ASSERT_PRE_VALUE_IS_TYPE(bool_obj, BT_VALUE_TYPE_BOOL); + BT_ASSERT_PRE_DEV_NON_NULL(bool_obj, "Value object"); + BT_ASSERT_PRE_DEV_VALUE_IS_TYPE(bool_obj, BT_VALUE_TYPE_BOOL); return BT_VALUE_TO_BOOL(bool_obj)->value; } @@ -782,24 +797,24 @@ void bt_value_bool_set(struct bt_value *bool_obj, bt_bool val) { BT_ASSERT_PRE_NON_NULL(bool_obj, "Value object"); BT_ASSERT_PRE_VALUE_IS_TYPE(bool_obj, BT_VALUE_TYPE_BOOL); - BT_ASSERT_PRE_VALUE_HOT(bool_obj, "Value object"); + BT_ASSERT_PRE_DEV_VALUE_HOT(bool_obj, "Value object"); BT_VALUE_TO_BOOL(bool_obj)->value = val; - BT_LOGV("Set boolean value's raw value: value-addr=%p, value=%d", + BT_LOGT("Set boolean value's raw value: value-addr=%p, value=%d", bool_obj, val); } -uint64_t bt_value_unsigned_integer_get(const struct bt_value *integer_obj) +uint64_t bt_value_integer_unsigned_get(const struct bt_value *integer_obj) { - BT_ASSERT_PRE_NON_NULL(integer_obj, "Value object"); - BT_ASSERT_PRE_VALUE_IS_TYPE(integer_obj, + BT_ASSERT_PRE_DEV_NON_NULL(integer_obj, "Value object"); + BT_ASSERT_PRE_DEV_VALUE_IS_TYPE(integer_obj, BT_VALUE_TYPE_UNSIGNED_INTEGER); return BT_VALUE_TO_INTEGER(integer_obj)->value.u; } -int64_t bt_value_signed_integer_get(const struct bt_value *integer_obj) +int64_t bt_value_integer_signed_get(const struct bt_value *integer_obj) { - BT_ASSERT_PRE_NON_NULL(integer_obj, "Value object"); - BT_ASSERT_PRE_VALUE_IS_TYPE(integer_obj, + BT_ASSERT_PRE_DEV_NON_NULL(integer_obj, "Value object"); + BT_ASSERT_PRE_DEV_VALUE_IS_TYPE(integer_obj, BT_VALUE_TYPE_SIGNED_INTEGER); return BT_VALUE_TO_INTEGER(integer_obj)->value.i; } @@ -810,31 +825,31 @@ void bt_value_integer_set(struct bt_value *integer_obj, { BT_ASSERT_PRE_NON_NULL(integer_obj, "Value object"); BT_ASSERT_PRE_VALUE_IS_TYPE(integer_obj, expected_type); - BT_ASSERT_PRE_VALUE_HOT(integer_obj, "Value object"); + BT_ASSERT_PRE_DEV_VALUE_HOT(integer_obj, "Value object"); BT_VALUE_TO_INTEGER(integer_obj)->value.u = uval; } -void bt_value_unsigned_integer_set(struct bt_value *integer_obj, +void bt_value_integer_unsigned_set(struct bt_value *integer_obj, uint64_t val) { bt_value_integer_set(integer_obj, BT_VALUE_TYPE_UNSIGNED_INTEGER, val); - BT_LOGV("Set unsigned integer value's raw value: " + BT_LOGT("Set unsigned integer value's raw value: " "value-addr=%p, value=%" PRIu64, integer_obj, val); } -void bt_value_signed_integer_set(struct bt_value *integer_obj, +void bt_value_integer_signed_set(struct bt_value *integer_obj, int64_t val) { bt_value_integer_set(integer_obj, BT_VALUE_TYPE_SIGNED_INTEGER, (uint64_t) val); - BT_LOGV("Set signed integer value's raw value: " + BT_LOGT("Set signed integer value's raw value: " "value-addr=%p, value=%" PRId64, integer_obj, val); } double bt_value_real_get(const struct bt_value *real_obj) { - BT_ASSERT_PRE_NON_NULL(real_obj, "Value object"); - BT_ASSERT_PRE_VALUE_IS_TYPE(real_obj, BT_VALUE_TYPE_REAL); + BT_ASSERT_PRE_DEV_NON_NULL(real_obj, "Value object"); + BT_ASSERT_PRE_DEV_VALUE_IS_TYPE(real_obj, BT_VALUE_TYPE_REAL); return BT_VALUE_TO_REAL(real_obj)->value; } @@ -842,35 +857,35 @@ void bt_value_real_set(struct bt_value *real_obj, double 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_ASSERT_PRE_DEV_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", + BT_LOGT("Set real number value's raw value: value-addr=%p, value=%f", real_obj, val); } const char *bt_value_string_get(const struct bt_value *string_obj) { - BT_ASSERT_PRE_NON_NULL(string_obj, "Value object"); - BT_ASSERT_PRE_VALUE_IS_TYPE(string_obj, BT_VALUE_TYPE_STRING); + BT_ASSERT_PRE_DEV_NON_NULL(string_obj, "Value object"); + BT_ASSERT_PRE_DEV_VALUE_IS_TYPE(string_obj, BT_VALUE_TYPE_STRING); return BT_VALUE_TO_STRING(string_obj)->gstr->str; } -enum bt_value_status bt_value_string_set( +enum bt_value_string_set_status bt_value_string_set( struct bt_value *string_obj, const char *val) { BT_ASSERT_PRE_NON_NULL(string_obj, "Value object"); BT_ASSERT_PRE_VALUE_IS_TYPE(string_obj, BT_VALUE_TYPE_STRING); - BT_ASSERT_PRE_VALUE_HOT(string_obj, "Value object"); + BT_ASSERT_PRE_DEV_VALUE_HOT(string_obj, "Value object"); g_string_assign(BT_VALUE_TO_STRING(string_obj)->gstr, val); - BT_LOGV("Set string value's raw value: value-addr=%p, raw-value-addr=%p", + BT_LOGT("Set string value's raw value: value-addr=%p, raw-value-addr=%p", string_obj, val); - return BT_VALUE_STATUS_OK; + return BT_FUNC_STATUS_OK; } -uint64_t bt_value_array_get_size(const struct bt_value *array_obj) +uint64_t bt_value_array_get_length(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_ASSERT_PRE_DEV_NON_NULL(array_obj, "Value object"); + BT_ASSERT_PRE_DEV_VALUE_IS_TYPE(array_obj, BT_VALUE_TYPE_ARRAY); return (uint64_t) BT_VALUE_TO_ARRAY(array_obj)->garray->len; } @@ -880,10 +895,9 @@ struct bt_value *bt_value_array_borrow_element_by_index( struct bt_value_array *typed_array_obj = BT_VALUE_TO_ARRAY(array_obj); - BT_ASSERT_PRE_NON_NULL(array_obj, "Value object"); - BT_ASSERT_PRE_VALUE_IS_TYPE(array_obj, BT_VALUE_TYPE_ARRAY); - BT_ASSERT_PRE_VALUE_INDEX_IN_BOUNDS(index, - typed_array_obj->garray->len); + BT_ASSERT_PRE_DEV_NON_NULL(array_obj, "Value object"); + BT_ASSERT_PRE_DEV_VALUE_IS_TYPE(array_obj, BT_VALUE_TYPE_ARRAY); + BT_ASSERT_PRE_DEV_VALID_INDEX(index, typed_array_obj->garray->len); return g_ptr_array_index(typed_array_obj->garray, index); } @@ -895,7 +909,7 @@ const struct bt_value *bt_value_array_borrow_element_by_index_const( (void *) array_obj, index); } -enum bt_value_status bt_value_array_append_element( +enum bt_value_array_append_element_status bt_value_array_append_element( struct bt_value *array_obj, struct bt_value *element_obj) { @@ -905,19 +919,19 @@ enum bt_value_status bt_value_array_append_element( BT_ASSERT_PRE_NON_NULL(array_obj, "Array value object"); BT_ASSERT_PRE_NON_NULL(element_obj, "Element value object"); BT_ASSERT_PRE_VALUE_IS_TYPE(array_obj, BT_VALUE_TYPE_ARRAY); - BT_ASSERT_PRE_VALUE_HOT(array_obj, "Array value object"); + BT_ASSERT_PRE_DEV_VALUE_HOT(array_obj, "Array value object"); g_ptr_array_add(typed_array_obj->garray, element_obj); bt_object_get_ref(element_obj); - BT_LOGV("Appended element to array value: array-value-addr=%p, " + BT_LOGT("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; + return BT_FUNC_STATUS_OK; } -enum bt_value_status bt_value_array_append_bool_element( - struct bt_value *array_obj, bt_bool val) +enum bt_value_array_append_element_status +bt_value_array_append_bool_element(struct bt_value *array_obj, bt_bool val) { - enum bt_value_status ret; + enum bt_value_array_append_element_status ret; struct bt_value *bool_obj = NULL; bool_obj = bt_value_bool_create_init(val); @@ -927,36 +941,38 @@ enum bt_value_status bt_value_array_append_bool_element( return ret; } -enum bt_value_status bt_value_array_append_unsigned_integer_element( - struct bt_value *array_obj, uint64_t val) +enum bt_value_array_append_element_status +bt_value_array_append_unsigned_integer_element(struct bt_value *array_obj, + uint64_t val) { - enum bt_value_status ret; + enum bt_value_array_append_element_status ret; struct bt_value *integer_obj = NULL; - integer_obj = bt_value_unsigned_integer_create_init(val); + integer_obj = bt_value_integer_unsigned_create_init(val); ret = bt_value_array_append_element(array_obj, (void *) integer_obj); bt_object_put_ref(integer_obj); return ret; } -enum bt_value_status bt_value_array_append_signed_integer_element( - struct bt_value *array_obj, int64_t val) +enum bt_value_array_append_element_status +bt_value_array_append_signed_integer_element(struct bt_value *array_obj, + int64_t val) { - enum bt_value_status ret; + enum bt_value_array_append_element_status ret; struct bt_value *integer_obj = NULL; - integer_obj = bt_value_signed_integer_create_init(val); + integer_obj = bt_value_integer_signed_create_init(val); ret = bt_value_array_append_element(array_obj, (void *) integer_obj); bt_object_put_ref(integer_obj); return ret; } -enum bt_value_status bt_value_array_append_real_element( - struct bt_value *array_obj, double val) +enum bt_value_array_append_element_status +bt_value_array_append_real_element(struct bt_value *array_obj, double val) { - enum bt_value_status ret; + enum bt_value_array_append_element_status ret; struct bt_value *real_obj = NULL; real_obj = bt_value_real_create_init(val); @@ -966,10 +982,11 @@ enum bt_value_status bt_value_array_append_real_element( return ret; } -enum bt_value_status bt_value_array_append_string_element( - struct bt_value *array_obj, const char *val) +enum bt_value_array_append_element_status +bt_value_array_append_string_element(struct bt_value *array_obj, + const char *val) { - enum bt_value_status ret; + enum bt_value_array_append_element_status ret; struct bt_value *string_obj = NULL; string_obj = bt_value_string_create_init(val); @@ -979,34 +996,46 @@ enum bt_value_status bt_value_array_append_string_element( return ret; } -enum bt_value_status bt_value_array_append_empty_array_element( - struct bt_value *array_obj) +enum bt_value_array_append_element_status +bt_value_array_append_empty_array_element(struct bt_value *array_obj, + struct bt_value **element_obj) { - enum bt_value_status ret; + enum bt_value_array_append_element_status ret; struct bt_value *empty_array_obj = NULL; empty_array_obj = bt_value_array_create(); ret = bt_value_array_append_element(array_obj, (void *) empty_array_obj); + + if (element_obj) { + *element_obj = empty_array_obj; + } + bt_object_put_ref(empty_array_obj); return ret; } -enum bt_value_status bt_value_array_append_empty_map_element( - struct bt_value *array_obj) +enum bt_value_array_append_element_status +bt_value_array_append_empty_map_element(struct bt_value *array_obj, + struct bt_value **element_obj) { - enum bt_value_status ret; + enum bt_value_array_append_element_status ret; struct bt_value *map_obj = NULL; map_obj = bt_value_map_create(); ret = bt_value_array_append_element(array_obj, (void *) map_obj); + + if (element_obj) { + *element_obj = map_obj; + } + bt_object_put_ref(map_obj); return ret; } -enum bt_value_status bt_value_array_set_element_by_index( - struct bt_value *array_obj, uint64_t index, +enum bt_value_array_set_element_by_index_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 = @@ -1015,31 +1044,30 @@ enum bt_value_status bt_value_array_set_element_by_index( BT_ASSERT_PRE_NON_NULL(array_obj, "Array value object"); BT_ASSERT_PRE_NON_NULL(element_obj, "Element value object"); BT_ASSERT_PRE_VALUE_IS_TYPE(array_obj, BT_VALUE_TYPE_ARRAY); - BT_ASSERT_PRE_VALUE_HOT(array_obj, "Array value object"); - BT_ASSERT_PRE_VALUE_INDEX_IN_BOUNDS(index, - typed_array_obj->garray->len); + BT_ASSERT_PRE_DEV_VALUE_HOT(array_obj, "Array value object"); + BT_ASSERT_PRE_VALID_INDEX(index, typed_array_obj->garray->len); 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_object_get_ref(element_obj); - BT_LOGV("Set array value's element: array-value-addr=%p, " + BT_LOGT("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; + return BT_FUNC_STATUS_OK; } uint64_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_ASSERT_PRE_DEV_NON_NULL(map_obj, "Value object"); + BT_ASSERT_PRE_DEV_VALUE_IS_TYPE(map_obj, BT_VALUE_TYPE_MAP); return (uint64_t) g_hash_table_size(BT_VALUE_TO_MAP(map_obj)->ght); } struct bt_value *bt_value_map_borrow_entry_value(struct bt_value *map_obj, const char *key) { - BT_ASSERT_PRE_NON_NULL(map_obj, "Value object"); - BT_ASSERT_PRE_NON_NULL(key, "Key"); - BT_ASSERT_PRE_VALUE_IS_TYPE(map_obj, BT_VALUE_TYPE_MAP); + BT_ASSERT_PRE_DEV_NON_NULL(map_obj, "Value object"); + BT_ASSERT_PRE_DEV_NON_NULL(key, "Key"); + BT_ASSERT_PRE_DEV_VALUE_IS_TYPE(map_obj, BT_VALUE_TYPE_MAP); return g_hash_table_lookup(BT_VALUE_TO_MAP(map_obj)->ght, GUINT_TO_POINTER(g_quark_from_string(key))); } @@ -1052,35 +1080,35 @@ const struct bt_value *bt_value_map_borrow_entry_value_const( 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"); - BT_ASSERT_PRE_VALUE_IS_TYPE(map_obj, BT_VALUE_TYPE_MAP); + BT_ASSERT_PRE_DEV_NON_NULL(map_obj, "Value object"); + BT_ASSERT_PRE_DEV_NON_NULL(key, "Key"); + BT_ASSERT_PRE_DEV_VALUE_IS_TYPE(map_obj, BT_VALUE_TYPE_MAP); return bt_g_hash_table_contains(BT_VALUE_TO_MAP(map_obj)->ght, GUINT_TO_POINTER(g_quark_from_string(key))); } -enum bt_value_status bt_value_map_insert_entry( - struct bt_value *map_obj, - const char *key, struct bt_value *element_obj) +enum bt_value_map_insert_entry_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_NON_NULL(key, "Key"); BT_ASSERT_PRE_NON_NULL(element_obj, "Element value object"); BT_ASSERT_PRE_VALUE_IS_TYPE(map_obj, BT_VALUE_TYPE_MAP); - BT_ASSERT_PRE_VALUE_HOT(map_obj, "Map value object"); + BT_ASSERT_PRE_DEV_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_object_get_ref(element_obj); - BT_LOGV("Inserted value into map value: map-value-addr=%p, " + BT_LOGT("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; + return BT_FUNC_STATUS_OK; } -enum bt_value_status bt_value_map_insert_bool_entry( +enum bt_value_map_insert_entry_status bt_value_map_insert_bool_entry( struct bt_value *map_obj, const char *key, bt_bool val) { - enum bt_value_status ret; + enum bt_value_map_insert_entry_status ret; struct bt_value *bool_obj = NULL; bool_obj = bt_value_bool_create_init(val); @@ -1090,36 +1118,38 @@ enum bt_value_status bt_value_map_insert_bool_entry( return ret; } -enum bt_value_status bt_value_map_insert_unsigned_integer_entry( - struct bt_value *map_obj, const char *key, uint64_t val) +enum bt_value_map_insert_entry_status +bt_value_map_insert_unsigned_integer_entry(struct bt_value *map_obj, + const char *key, uint64_t val) { - enum bt_value_status ret; + enum bt_value_map_insert_entry_status ret; struct bt_value *integer_obj = NULL; - integer_obj = bt_value_unsigned_integer_create_init(val); + integer_obj = bt_value_integer_unsigned_create_init(val); ret = bt_value_map_insert_entry(map_obj, key, (void *) integer_obj); bt_object_put_ref(integer_obj); return ret; } -enum bt_value_status bt_value_map_insert_signed_integer_entry( - struct bt_value *map_obj, const char *key, int64_t val) +enum bt_value_map_insert_entry_status +bt_value_map_insert_signed_integer_entry(struct bt_value *map_obj, + const char *key, int64_t val) { - enum bt_value_status ret; + enum bt_value_map_insert_entry_status ret; struct bt_value *integer_obj = NULL; - integer_obj = bt_value_signed_integer_create_init(val); + integer_obj = bt_value_integer_signed_create_init(val); ret = bt_value_map_insert_entry(map_obj, key, (void *) integer_obj); bt_object_put_ref(integer_obj); return ret; } -enum bt_value_status bt_value_map_insert_real_entry( +enum bt_value_map_insert_entry_status bt_value_map_insert_real_entry( struct bt_value *map_obj, const char *key, double val) { - enum bt_value_status ret; + enum bt_value_map_insert_entry_status ret; struct bt_value *real_obj = NULL; real_obj = bt_value_real_create_init(val); @@ -1129,11 +1159,11 @@ enum bt_value_status bt_value_map_insert_real_entry( return ret; } -enum bt_value_status bt_value_map_insert_string_entry( +enum bt_value_map_insert_entry_status bt_value_map_insert_string_entry( struct bt_value *map_obj, const char *key, const char *val) { - enum bt_value_status ret; + enum bt_value_map_insert_entry_status ret; struct bt_value *string_obj = NULL; string_obj = bt_value_string_create_init(val); @@ -1143,53 +1173,67 @@ enum bt_value_status bt_value_map_insert_string_entry( return ret; } -enum bt_value_status bt_value_map_insert_empty_array_entry( - struct bt_value *map_obj, const char *key) +enum bt_value_map_insert_entry_status +bt_value_map_insert_empty_array_entry( + struct bt_value *map_obj, const char *key, + bt_value **entry_obj) { - enum bt_value_status ret; + enum bt_value_map_insert_entry_status ret; struct bt_value *array_obj = NULL; array_obj = bt_value_array_create(); ret = bt_value_map_insert_entry(map_obj, key, (void *) array_obj); + + if (entry_obj) { + *entry_obj = array_obj; + } + bt_object_put_ref(array_obj); return ret; } -enum bt_value_status bt_value_map_insert_empty_map_entry( - struct bt_value *map_obj, const char *key) +enum bt_value_map_insert_entry_status +bt_value_map_insert_empty_map_entry(struct bt_value *map_obj, const char *key, + bt_value **entry_obj) { - enum bt_value_status ret; + enum bt_value_map_insert_entry_status ret; struct bt_value *empty_map_obj = NULL; empty_map_obj = bt_value_map_create(); ret = bt_value_map_insert_entry(map_obj, key, (void *) empty_map_obj); + + if (entry_obj) { + *entry_obj = empty_map_obj; + } + bt_object_put_ref(empty_map_obj); return ret; } -enum bt_value_status bt_value_map_foreach_entry(struct bt_value *map_obj, - bt_value_map_foreach_entry_func func, void *data) +enum bt_value_map_foreach_entry_status bt_value_map_foreach_entry( + struct bt_value *map_obj, bt_value_map_foreach_entry_func func, + void *data) { - enum bt_value_status ret = BT_VALUE_STATUS_OK; + enum bt_value_map_foreach_entry_status ret = BT_FUNC_STATUS_OK; gpointer key, element_obj; GHashTableIter iter; struct bt_value_map *typed_map_obj = BT_VALUE_TO_MAP(map_obj); - BT_ASSERT_PRE_NON_NULL(map_obj, "Value object"); - BT_ASSERT_PRE_NON_NULL(func, "Callback"); - BT_ASSERT_PRE_VALUE_IS_TYPE(map_obj, BT_VALUE_TYPE_MAP); + BT_ASSERT_PRE_DEV_NON_NULL(map_obj, "Value object"); + BT_ASSERT_PRE_DEV_NON_NULL(func, "Callback"); + BT_ASSERT_PRE_DEV_VALUE_IS_TYPE(map_obj, BT_VALUE_TYPE_MAP); g_hash_table_iter_init(&iter, typed_map_obj->ght); while (g_hash_table_iter_next(&iter, &key, &element_obj)) { const char *key_str = g_quark_to_string(GPOINTER_TO_UINT(key)); if (!func(key_str, element_obj, data)) { - BT_LOGV("User canceled the loop: key=\"%s\", " + BT_LOGT("User interrupted the loop: key=\"%s\", " "value-addr=%p, data=%p", key_str, element_obj, data); - ret = BT_VALUE_STATUS_CANCELED; + ret = BT_FUNC_STATUS_INTERRUPTED; break; } } @@ -1197,17 +1241,17 @@ enum bt_value_status bt_value_map_foreach_entry(struct bt_value *map_obj, return ret; } -enum bt_value_status bt_value_map_foreach_entry_const( +enum bt_value_map_foreach_entry_const_status bt_value_map_foreach_entry_const( const struct bt_value *map_obj, bt_value_map_foreach_entry_const_func func, void *data) { - return bt_value_map_foreach_entry((void *) map_obj, + return (int) bt_value_map_foreach_entry((void *) map_obj, (bt_value_map_foreach_entry_func) func, data); } struct extend_map_element_data { struct bt_value *extended_obj; - enum bt_value_status status; + int status; }; static @@ -1220,9 +1264,9 @@ bt_bool extend_map_element(const char *key, /* Copy object which is to replace the current one */ extend_data->status = bt_value_copy(extension_obj_elem, - &extension_obj_elem_copy); + &extension_obj_elem_copy); if (extend_data->status) { - BT_LOGE("Cannot copy map element: addr=%p", + BT_LIB_LOGE_APPEND_CAUSE("Cannot copy map element: %!+v", extension_obj_elem); goto error; } @@ -1234,8 +1278,9 @@ bt_bool extend_map_element(const char *key, extend_data->extended_obj, key, (void *) extension_obj_elem_copy); if (extend_data->status) { - BT_LOGE("Cannot replace value in extended value: key=\"%s\", " - "extended-value-addr=%p, element-value-addr=%p", + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot replace value in extended value: key=\"%s\", " + "%![extended-value-]+v, %![element-value-]+v", key, extend_data->extended_obj, extension_obj_elem_copy); goto error; @@ -1244,7 +1289,7 @@ bt_bool extend_map_element(const char *key, goto end; error: - BT_ASSERT(extend_data->status != BT_VALUE_STATUS_OK); + BT_ASSERT(extend_data->status != BT_FUNC_STATUS_OK); ret = BT_FALSE; end: @@ -1252,14 +1297,14 @@ end: return ret; } -enum bt_value_status bt_value_map_extend( +enum bt_value_map_extend_status bt_value_map_extend( const struct bt_value *base_map_obj, const struct bt_value *extension_obj, struct bt_value **extended_map_obj) { struct extend_map_element_data extend_data = { .extended_obj = NULL, - .status = BT_VALUE_STATUS_OK, + .status = BT_FUNC_STATUS_OK, }; BT_ASSERT_PRE_NON_NULL(base_map_obj, "Base value object"); @@ -1275,7 +1320,8 @@ enum bt_value_status bt_value_map_extend( /* Create copy of base map object to start with */ extend_data.status = bt_value_copy(base_map_obj, extended_map_obj); if (extend_data.status) { - BT_LOGE("Cannot copy base value: base-value-addr=%p", + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot copy base value: %![base-value-]+v", base_map_obj); goto error; } @@ -1290,14 +1336,16 @@ enum bt_value_status bt_value_map_extend( if (bt_value_map_foreach_entry_const(extension_obj, extend_map_element, &extend_data)) { - BT_LOGE("Cannot iterate on the extension object's elements: " - "extension-value-addr=%p", extension_obj); + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot iterate on the extension object's elements: " + "%![extension-value-]+v", extension_obj); goto error; } if (extend_data.status) { - BT_LOGE("Failed to successfully iterate on the extension object's elements: " - "extension-value-addr=%p", extension_obj); + BT_LIB_LOGE_APPEND_CAUSE( + "Failed to successfully iterate on the extension object's elements: " + "%![extension-value-]+v", extension_obj); goto error; } @@ -1313,10 +1361,10 @@ end: return extend_data.status; } -enum bt_value_status bt_value_copy(const struct bt_value *object, +enum bt_value_copy_status bt_value_copy(const struct bt_value *object, struct bt_value **copy_obj) { - enum bt_value_status status = BT_VALUE_STATUS_OK; + enum bt_value_copy_status status = BT_FUNC_STATUS_OK; BT_ASSERT_PRE_NON_NULL(object, "Value object"); BT_ASSERT_PRE_NON_NULL(copy_obj, "Value object copy (output)"); @@ -1326,9 +1374,9 @@ enum bt_value_status bt_value_copy(const struct bt_value *object, BT_LOGD("Copied value object: copy-value-addr=%p", copy_obj); } else { - status = BT_VALUE_STATUS_NOMEM; + status = BT_FUNC_STATUS_MEMORY_ERROR; *copy_obj = NULL; - BT_LOGE_STR("Failed to copy value object."); + BT_LIB_LOGE_APPEND_CAUSE("Failed to copy value object."); } return status; @@ -1339,11 +1387,11 @@ bt_bool bt_value_compare(const struct bt_value *object_a, { bt_bool ret = BT_FALSE; - BT_ASSERT_PRE_NON_NULL(object_a, "Value object A"); - BT_ASSERT_PRE_NON_NULL(object_b, "Value object B"); + BT_ASSERT_PRE_DEV_NON_NULL(object_a, "Value object A"); + BT_ASSERT_PRE_DEV_NON_NULL(object_b, "Value object B"); if (object_a->type != object_b->type) { - BT_LOGV("Values are different: type mismatch: " + BT_LOGT("Values are different: type mismatch: " "value-a-addr=%p, value-b-addr=%p, " "value-a-type=%s, value-b-type=%s", object_a, object_b,