X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fvalues.c;h=4719e4514ed33bbc8363606c931028bc3edff04a;hp=42ad8bdd32e569283c27490de6015baf788cf6af;hb=312c056ae3d374b253fa0cfe5ed576c0b0e5e569;hpb=8fff8ba9d3203b19abc62020669f7e3551bdfecf diff --git a/lib/values.c b/lib/values.c index 42ad8bdd..4719e451 100644 --- a/lib/values.c +++ b/lib/values.c @@ -30,7 +30,6 @@ #include #include -#include #include #include #include @@ -40,6 +39,8 @@ #include #include #include +#include +#include #define BT_VALUE_FROM_CONCRETE(_concrete) ((struct bt_value *) (_concrete)) #define BT_VALUE_TO_BOOL(_base) ((struct bt_value_bool *) (_base)) @@ -49,10 +50,25 @@ #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((_value)->type == (_type), \ + "Value has the wrong type ID: expected-type=%s, " \ + "%![value-]+v", bt_value_type_string(_type), \ + (_value)) + +#define BT_ASSERT_PRE_VALUE_HOT(_value, _name) \ + BT_ASSERT_PRE_HOT((_value), (_name), ": +%!+v", (_value)) + +#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)); + + struct bt_value { struct bt_object base; enum bt_value_type type; - bt_bool is_frozen; + bt_bool frozen; }; static @@ -64,9 +80,10 @@ struct bt_value bt_value_null_instance = { }, .release = NULL, .parent = NULL, + .is_shared = true, }, .type = BT_VALUE_TYPE_NULL, - .is_frozen = BT_TRUE, + .frozen = BT_TRUE, }; struct bt_value *bt_value_null = &bt_value_null_instance; @@ -186,7 +203,6 @@ struct bt_value *bt_value_array_copy(const struct bt_value *array_obj) BT_LOGD("Copying array value: addr=%p", 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."); goto end; @@ -194,11 +210,13 @@ struct bt_value *bt_value_array_copy(const struct bt_value *array_obj) for (i = 0; i < typed_array_obj->garray->len; ++i) { struct bt_value *element_obj_copy; - struct bt_value *element_obj = bt_value_array_get(array_obj, i); + struct bt_value *element_obj = bt_value_array_borrow( + array_obj, i); - assert(element_obj); + BT_ASSERT(element_obj); + BT_LOGD("Copying array value's element: element-addr=%p, " + "index=%d", element_obj, i); element_obj_copy = bt_value_copy(element_obj); - BT_PUT(element_obj); if (!element_obj_copy) { BT_LOGE("Cannot copy array value's element: " "array-addr=%p, index=%d", @@ -237,7 +255,6 @@ struct bt_value *bt_value_map_copy(const struct bt_value *map_obj) BT_LOGD("Copying map value: addr=%p", map_obj); typed_map_obj = BT_VALUE_TO_MAP(map_obj); copy_obj = bt_value_map_create(); - if (!copy_obj) { goto end; } @@ -247,6 +264,9 @@ struct bt_value *bt_value_map_copy(const struct bt_value *map_obj) 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_LOGD("Copying map value's element: element-addr=%p, " + "key=\"%s\"", element_obj, key_str); element_obj_copy = bt_value_copy(element_obj); if (!element_obj_copy) { BT_LOGE("Cannot copy map value's element: " @@ -299,32 +319,64 @@ static bt_bool bt_value_bool_compare(const struct bt_value *object_a, const struct bt_value *object_b) { - return BT_VALUE_TO_BOOL(object_a)->value == - BT_VALUE_TO_BOOL(object_b)->value; + if (BT_VALUE_TO_BOOL(object_a)->value != + BT_VALUE_TO_BOOL(object_b)->value) { + BT_LOGV("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); + return BT_FALSE; + } + + return BT_TRUE; } static bt_bool bt_value_integer_compare(const struct bt_value *object_a, const struct bt_value *object_b) { - return BT_VALUE_TO_INTEGER(object_a)->value == - BT_VALUE_TO_INTEGER(object_b)->value; + if (BT_VALUE_TO_INTEGER(object_a)->value != + BT_VALUE_TO_INTEGER(object_b)->value) { + BT_LOGV("Integer value objects are different: " + "int-a-val=%" PRId64 ", int-b-val=%" PRId64, + BT_VALUE_TO_INTEGER(object_a)->value, + BT_VALUE_TO_INTEGER(object_b)->value); + return BT_FALSE; + } + + return BT_TRUE; } static bt_bool bt_value_float_compare(const struct bt_value *object_a, const struct bt_value *object_b) { - return BT_VALUE_TO_FLOAT(object_a)->value == - BT_VALUE_TO_FLOAT(object_b)->value; + 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); + return BT_FALSE; + } + + return BT_TRUE; } static bt_bool bt_value_string_compare(const struct bt_value *object_a, const struct bt_value *object_b) { - return !strcmp(BT_VALUE_TO_STRING(object_a)->gstr->str, - BT_VALUE_TO_STRING(object_b)->gstr->str); + 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: " + "string-a-val=\"%s\", string-b-val=\"%s\"", + BT_VALUE_TO_STRING(object_a)->gstr->str, + BT_VALUE_TO_STRING(object_b)->gstr->str); + return BT_FALSE; + } + + return BT_TRUE; } static @@ -351,21 +403,16 @@ bt_bool bt_value_array_compare(const struct bt_value *object_a, struct bt_value *element_obj_a; struct bt_value *element_obj_b; - element_obj_a = bt_value_array_get(object_a, i); - element_obj_b = bt_value_array_get(object_b, i); + element_obj_a = bt_value_array_borrow(object_a, i); + element_obj_b = bt_value_array_borrow(object_b, i); if (!bt_value_compare(element_obj_a, element_obj_b)) { BT_LOGV("Array values's elements are different: " "value-a-addr=%p, value-b-addr=%p, index=%d", - element_obj_a, element_obj_b, index); - BT_PUT(element_obj_a); - BT_PUT(element_obj_b); + element_obj_a, element_obj_b, i); ret = BT_FALSE; goto end; } - - BT_PUT(element_obj_a); - BT_PUT(element_obj_b); } end: @@ -398,18 +445,15 @@ bt_bool bt_value_map_compare(const struct bt_value *object_a, struct bt_value *element_obj_b; const char *key_str = g_quark_to_string(GPOINTER_TO_UINT(key)); - element_obj_b = bt_value_map_get(object_b, key_str); + element_obj_b = bt_value_map_borrow(object_b, key_str); if (!bt_value_compare(element_obj_a, element_obj_b)) { BT_LOGV("Map values's elements are different: " "value-a-addr=%p, value-b-addr=%p, key=\"%s\"", element_obj_a, element_obj_b, key_str); - BT_PUT(element_obj_b); ret = BT_FALSE; goto end; } - - BT_PUT(element_obj_b); } end: @@ -422,21 +466,24 @@ bt_bool (* const compare_funcs[])(const struct bt_value *, [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_FLOAT] = bt_value_float_compare, [BT_VALUE_TYPE_STRING] = bt_value_string_compare, - [BT_VALUE_TYPE_ARRAY] = bt_value_array_compare, + [BT_VALUE_TYPE_ARRAY] = bt_value_array_compare, [BT_VALUE_TYPE_MAP] = bt_value_map_compare, }; +static void bt_value_null_freeze(struct bt_value *object) { } +static void bt_value_generic_freeze(struct bt_value *object) { - object->is_frozen = BT_TRUE; + object->frozen = BT_TRUE; } +static void bt_value_array_freeze(struct bt_value *object) { int i; @@ -444,15 +491,13 @@ void bt_value_array_freeze(struct bt_value *object) BT_VALUE_TO_ARRAY(object); for (i = 0; i < typed_array_obj->garray->len; ++i) { - struct bt_value *element_obj = - g_ptr_array_index(typed_array_obj->garray, i); - - bt_value_freeze(element_obj); + bt_value_freeze(g_ptr_array_index(typed_array_obj->garray, i)); } bt_value_generic_freeze(object); } +static void bt_value_map_freeze(struct bt_value *object) { GHashTableIter iter; @@ -485,7 +530,7 @@ void bt_value_destroy(struct bt_object *obj) struct bt_value *value; value = container_of(obj, struct bt_value, base); - assert(value->type != BT_VALUE_TYPE_UNKNOWN); + BT_ASSERT(value->type != BT_VALUE_TYPE_UNKNOWN); BT_LOGD("Destroying value: addr=%p", value); if (bt_value_is_null(value)) { @@ -500,17 +545,14 @@ void bt_value_destroy(struct bt_object *obj) g_free(value); } -enum bt_value_status bt_value_freeze(struct bt_value *object) +BT_HIDDEN +enum bt_value_status _bt_value_freeze(struct bt_value *object) { enum bt_value_status ret = BT_VALUE_STATUS_OK; - if (!object) { - BT_LOGW_STR("Invalid parameter: value object is NULL."); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } + BT_ASSERT(object); - if (object->is_frozen) { + if (object->frozen) { goto end; } @@ -521,18 +563,9 @@ end: return ret; } -bt_bool bt_value_is_frozen(const struct bt_value *object) -{ - return object && object->is_frozen; -} - enum bt_value_type bt_value_get_type(const struct bt_value *object) { - if (!object) { - BT_LOGW_STR("Invalid parameter: value object is NULL."); - return BT_VALUE_TYPE_UNKNOWN; - } - + BT_ASSERT_PRE_NON_NULL(object, "Value object"); return object->type; } @@ -542,7 +575,7 @@ struct bt_value bt_value_create_base(enum bt_value_type type) struct bt_value base; base.type = type; - base.is_frozen = BT_FALSE; + base.frozen = BT_FALSE; bt_object_init(&base, bt_value_destroy); return base; } @@ -553,7 +586,6 @@ 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."); goto end; @@ -578,7 +610,6 @@ struct bt_value *bt_value_integer_create_init(int64_t val) BT_LOGD("Creating integer value object: val=%" PRId64, val); integer_obj = g_new0(struct bt_value_integer, 1); - if (!integer_obj) { BT_LOGE_STR("Failed to allocate one integer value object."); goto end; @@ -604,7 +635,6 @@ struct bt_value *bt_value_float_create_init(double val) 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."); goto end; @@ -633,9 +663,8 @@ struct bt_value *bt_value_string_create_init(const char *val) goto end; } - BT_LOGD("Creating string value object: val-len=%u", strlen(val)); + 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."); goto end; @@ -643,7 +672,6 @@ struct bt_value *bt_value_string_create_init(const char *val) 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."); g_free(string_obj); @@ -669,7 +697,6 @@ 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."); goto end; @@ -678,7 +705,6 @@ struct bt_value *bt_value_array_create(void) array_obj->base = bt_value_create_base(BT_VALUE_TYPE_ARRAY); array_obj->garray = bt_g_ptr_array_new_full(0, (GDestroyNotify) bt_put); - if (!array_obj->garray) { BT_LOGE_STR("Failed to allocate a GPtrArray."); g_free(array_obj); @@ -699,7 +725,6 @@ 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."); goto end; @@ -708,7 +733,6 @@ struct bt_value *bt_value_map_create(void) 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); - if (!map_obj->ght) { BT_LOGE_STR("Failed to allocate a GHashTable."); g_free(map_obj); @@ -726,286 +750,96 @@ end: enum bt_value_status bt_value_bool_get(const struct bt_value *bool_obj, bt_bool *val) { - enum bt_value_status ret = BT_VALUE_STATUS_OK; - struct bt_value_bool *typed_bool_obj = BT_VALUE_TO_BOOL(bool_obj); - - if (!bool_obj || !val) { - BT_LOGW("Invalid parameter: value object or value is NULL: " - "value-addr=%p, raw-value-addr=%p", - bool_obj, val); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - if (!bt_value_is_bool(bool_obj)) { - BT_LOGW("Invalid parameter: value is not a boolean value: addr=%p, " - "type=%s", bool_obj, bool_obj->type, - bt_value_type_string(bool_obj->type)); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - *val = typed_bool_obj->value; - -end: - return ret; + BT_ASSERT_PRE_NON_NULL(bool_obj, "Value object"); + BT_ASSERT_PRE_NON_NULL(val, "Raw value"); + BT_ASSERT_PRE_VALUE_IS_TYPE(bool_obj, BT_VALUE_TYPE_BOOL); + *val = BT_VALUE_TO_BOOL(bool_obj)->value; + return BT_VALUE_STATUS_OK; } enum bt_value_status bt_value_bool_set(struct bt_value *bool_obj, bt_bool val) { - enum bt_value_status ret = BT_VALUE_STATUS_OK; - struct bt_value_bool *typed_bool_obj = BT_VALUE_TO_BOOL(bool_obj); - - if (!bool_obj) { - BT_LOGW_STR("Invalid parameter: value object is NULL."); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - if (!bt_value_is_bool(bool_obj)) { - BT_LOGW("Invalid parameter: value is not a boolean value: addr=%p, " - "type=%s", bool_obj, - bt_value_type_string(bool_obj->type)); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - if (bool_obj->is_frozen) { - BT_LOGW("Invalid parameter: value is frozen: addr=%p", - bool_obj); - ret = BT_VALUE_STATUS_FROZEN; - goto end; - } - - typed_bool_obj->value = 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_VALUE_TO_BOOL(bool_obj)->value = val; BT_LOGV("Set boolean value's raw value: value-addr=%p, value=%d", bool_obj, val); - -end: - return ret; + return BT_VALUE_STATUS_OK; } enum bt_value_status bt_value_integer_get(const struct bt_value *integer_obj, int64_t *val) { - enum bt_value_status ret = BT_VALUE_STATUS_OK; - struct bt_value_integer *typed_integer_obj = - BT_VALUE_TO_INTEGER(integer_obj); - - if (!integer_obj || !val) { - BT_LOGW("Invalid parameter: value object or value is NULL: " - "value-addr=%p, raw-value-addr=%p", - integer_obj, val); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - if (!bt_value_is_integer(integer_obj)) { - BT_LOGW("Invalid parameter: value is not an integer value: addr=%p, " - "type=%s", integer_obj, - bt_value_type_string(integer_obj->type)); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - *val = typed_integer_obj->value; - -end: - return ret; + BT_ASSERT_PRE_NON_NULL(integer_obj, "Value object"); + BT_ASSERT_PRE_NON_NULL(val, "Raw value"); + BT_ASSERT_PRE_VALUE_IS_TYPE(integer_obj, BT_VALUE_TYPE_INTEGER); + *val = BT_VALUE_TO_INTEGER(integer_obj)->value; + return BT_VALUE_STATUS_OK; } enum bt_value_status bt_value_integer_set(struct bt_value *integer_obj, int64_t val) { - enum bt_value_status ret = BT_VALUE_STATUS_OK; - struct bt_value_integer *typed_integer_obj = - BT_VALUE_TO_INTEGER(integer_obj); - - if (!integer_obj) { - BT_LOGW_STR("Invalid parameter: value object is NULL."); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - if (!bt_value_is_integer(integer_obj)) { - BT_LOGW("Invalid parameter: value is not an integer value: addr=%p, " - "type=%s", integer_obj, - bt_value_type_string(integer_obj->type)); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - if (integer_obj->is_frozen) { - BT_LOGW("Invalid parameter: value is frozen: addr=%p", - integer_obj); - ret = BT_VALUE_STATUS_FROZEN; - goto end; - } - - typed_integer_obj->value = val; + BT_ASSERT_PRE_NON_NULL(integer_obj, "Value object"); + BT_ASSERT_PRE_VALUE_IS_TYPE(integer_obj, BT_VALUE_TYPE_INTEGER); + BT_ASSERT_PRE_VALUE_HOT(integer_obj, "Value object"); + BT_VALUE_TO_INTEGER(integer_obj)->value = val; BT_LOGV("Set integer value's raw value: value-addr=%p, value=%" PRId64, integer_obj, val); - -end: - return ret; + return BT_VALUE_STATUS_OK; } enum bt_value_status bt_value_float_get(const struct bt_value *float_obj, double *val) { - enum bt_value_status ret = BT_VALUE_STATUS_OK; - struct bt_value_float *typed_float_obj = - BT_VALUE_TO_FLOAT(float_obj); - - if (!float_obj || !val) { - BT_LOGW("Invalid parameter: value object or value is NULL: " - "value-addr=%p, raw-value-addr=%p", - float_obj, val); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - if (!bt_value_is_float(float_obj)) { - BT_LOGW("Invalid parameter: value is not a floating point number value: addr=%p, " - "type=%s", float_obj, - bt_value_type_string(float_obj->type)); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - *val = typed_float_obj->value; - -end: - return ret; + BT_ASSERT_PRE_NON_NULL(float_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; + return BT_VALUE_STATUS_OK; } enum bt_value_status bt_value_float_set(struct bt_value *float_obj, double val) { - enum bt_value_status ret = BT_VALUE_STATUS_OK; - struct bt_value_float *typed_float_obj = - BT_VALUE_TO_FLOAT(float_obj); - - if (!float_obj) { - BT_LOGW_STR("Invalid parameter: value object is NULL."); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - if (!bt_value_is_float(float_obj)) { - BT_LOGW("Invalid parameter: value is not a floating point number value: addr=%p, " - "type=%s", float_obj, - bt_value_type_string(float_obj->type)); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - if (float_obj->is_frozen) { - BT_LOGW("Invalid parameter: value is frozen: addr=%p", - float_obj); - ret = BT_VALUE_STATUS_FROZEN; - goto end; - } - - typed_float_obj->value = 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); - -end: - return ret; + return BT_VALUE_STATUS_OK; } enum bt_value_status bt_value_string_get(const struct bt_value *string_obj, const char **val) { - enum bt_value_status ret = BT_VALUE_STATUS_OK; - struct bt_value_string *typed_string_obj = - BT_VALUE_TO_STRING(string_obj); - - if (!string_obj || !val) { - BT_LOGW("Invalid parameter: value object or value is NULL: " - "value-addr=%p, raw-value-addr=%p", - string_obj, val); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - if (!bt_value_is_string(string_obj)) { - BT_LOGW("Invalid parameter: value is not a string value: addr=%p, " - "type=%s", string_obj, - bt_value_type_string(string_obj->type)); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - *val = typed_string_obj->gstr->str; - -end: - return ret; + BT_ASSERT_PRE_NON_NULL(string_obj, "Value object"); + BT_ASSERT_PRE_NON_NULL(val, "Raw value"); + BT_ASSERT_PRE_VALUE_IS_TYPE(string_obj, BT_VALUE_TYPE_STRING); + *val = BT_VALUE_TO_STRING(string_obj)->gstr->str; + return BT_VALUE_STATUS_OK; } enum bt_value_status bt_value_string_set(struct bt_value *string_obj, const char *val) { - enum bt_value_status ret = BT_VALUE_STATUS_OK; - struct bt_value_string *typed_string_obj = - BT_VALUE_TO_STRING(string_obj); - - if (!string_obj || !val) { - BT_LOGW("Invalid parameter: value object or value is NULL: " - "value-addr=%p, raw-value-addr=%p", - string_obj, val); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - if (!bt_value_is_string(string_obj)) { - BT_LOGW("Invalid parameter: value is not a string value: addr=%p, " - "type=%s", string_obj, - bt_value_type_string(string_obj->type)); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - if (string_obj->is_frozen) { - BT_LOGW("Invalid parameter: value is frozen: addr=%p", - string_obj); - ret = BT_VALUE_STATUS_FROZEN; - goto end; - } - - g_string_assign(typed_string_obj->gstr, val); + BT_ASSERT_PRE_NON_NULL(string_obj, "Value object"); + BT_ASSERT_PRE_NON_NULL(val, "Raw value"); + BT_ASSERT_PRE_VALUE_IS_TYPE(string_obj, BT_VALUE_TYPE_STRING); + BT_ASSERT_PRE_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", string_obj, val); - -end: - return ret; + return BT_VALUE_STATUS_OK; } int64_t bt_value_array_size(const struct bt_value *array_obj) { - int64_t ret; - struct bt_value_array *typed_array_obj = - BT_VALUE_TO_ARRAY(array_obj); - - if (!array_obj) { - BT_LOGW_STR("Invalid parameter: value object is NULL."); - ret = (int64_t) BT_VALUE_STATUS_INVAL; - goto end; - } - - if (!bt_value_is_array(array_obj)) { - BT_LOGW("Invalid parameter: value is not an array value: addr=%p, " - "type=%s", array_obj, - bt_value_type_string(array_obj->type)); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - ret = (int64_t) typed_array_obj->garray->len; - -end: - return ret; + BT_ASSERT_PRE_NON_NULL(array_obj, "Value object"); + BT_ASSERT_PRE_VALUE_IS_TYPE(array_obj, BT_VALUE_TYPE_ARRAY); + return (int64_t) BT_VALUE_TO_ARRAY(array_obj)->garray->len; } bt_bool bt_value_array_is_empty(const struct bt_value *array_obj) @@ -1013,81 +847,35 @@ bt_bool bt_value_array_is_empty(const struct bt_value *array_obj) return bt_value_array_size(array_obj) == 0; } -struct bt_value *bt_value_array_get(const struct bt_value *array_obj, +struct bt_value *bt_value_array_borrow(const struct bt_value *array_obj, uint64_t index) { - struct bt_value *ret; struct bt_value_array *typed_array_obj = BT_VALUE_TO_ARRAY(array_obj); - if (!array_obj) { - BT_LOGW("Invalid parameter: value object is NULL: index=%" PRIu64, - index); - ret = NULL; - goto end; - } - - if (!bt_value_is_array(array_obj)) { - BT_LOGW("Invalid parameter: value is not an array value: addr=%p, " - "type=%s", array_obj, - bt_value_type_string(array_obj->type)); - ret = NULL; - goto end; - } - - if (index >= typed_array_obj->garray->len) { - BT_LOGW("Invalid parameter: index is out of bounds: " - "addr=%p, index=%" PRIu64 ", size=%u", - array_obj, index, typed_array_obj->garray->len); - ret = NULL; - goto end; - } - - ret = g_ptr_array_index(typed_array_obj->garray, index); - bt_get(ret); - -end: - return ret; + 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); + return g_ptr_array_index(typed_array_obj->garray, index); } enum bt_value_status bt_value_array_append(struct bt_value *array_obj, struct bt_value *element_obj) { - enum bt_value_status ret = BT_VALUE_STATUS_OK; struct bt_value_array *typed_array_obj = BT_VALUE_TO_ARRAY(array_obj); - if (!array_obj || !element_obj) { - BT_LOGW("Invalid parameter: array value or element value is NULL: " - "array-value-addr=%p, element-value-addr=%p", - array_obj, element_obj); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - if (!bt_value_is_array(array_obj)) { - BT_LOGW("Invalid parameter: value is not an array value: addr=%p, " - "type=%s", array_obj, - bt_value_type_string(array_obj->type)); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - if (array_obj->is_frozen) { - BT_LOGW("Invalid parameter: value is frozen: addr=%p", - array_obj); - ret = BT_VALUE_STATUS_FROZEN; - goto end; - } - + 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"); g_ptr_array_add(typed_array_obj->garray, element_obj); bt_get(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); - -end: - return ret; + return BT_VALUE_STATUS_OK; } enum bt_value_status bt_value_array_append_bool(struct bt_value *array_obj, @@ -1164,75 +952,29 @@ enum bt_value_status bt_value_array_append_empty_map(struct bt_value *array_obj) enum bt_value_status bt_value_array_set(struct bt_value *array_obj, uint64_t index, struct bt_value *element_obj) { - enum bt_value_status ret = BT_VALUE_STATUS_OK; struct bt_value_array *typed_array_obj = BT_VALUE_TO_ARRAY(array_obj); - if (!array_obj || !element_obj) { - BT_LOGW("Invalid parameter: array value or element value is NULL: " - "index=%" PRIu64 ", array-value-addr=%p, element-value-addr=%p", - index, array_obj, element_obj); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - if (!bt_value_is_array(array_obj)) { - BT_LOGW("Invalid parameter: value is not an array value: addr=%p, " - "type=%s", array_obj, - bt_value_type_string(array_obj->type)); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - if (index >= typed_array_obj->garray->len) { - BT_LOGW("Invalid parameter: index is out of bounds: " - "addr=%p, index=%" PRIu64 ", size=%u", - array_obj, index, typed_array_obj->garray->len); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - if (array_obj->is_frozen) { - BT_LOGW("Invalid parameter: value is frozen: addr=%p", - array_obj); - ret = BT_VALUE_STATUS_FROZEN; - goto end; - } - + 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_put(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_LOGV("Set array value's element: array-value-addr=%p, " "index=%" PRIu64 ", element-value-addr=%p", array_obj, index, element_obj); - -end: - return ret; + return BT_VALUE_STATUS_OK; } int64_t bt_value_map_size(const struct bt_value *map_obj) { - int64_t ret; - struct bt_value_map *typed_map_obj = BT_VALUE_TO_MAP(map_obj); - - if (!map_obj) { - BT_LOGW_STR("Invalid parameter: value object is NULL."); - ret = (int64_t) BT_VALUE_STATUS_INVAL; - goto end; - } - - if (!bt_value_is_map(map_obj)) { - BT_LOGW("Invalid parameter: value is not a map value: addr=%p, " - "type=%s", map_obj, - bt_value_type_string(map_obj->type)); - ret = (int64_t) BT_VALUE_STATUS_INVAL; - goto end; - } - - ret = (int64_t) g_hash_table_size(typed_map_obj->ght); - -end: - return ret; + BT_ASSERT_PRE_NON_NULL(map_obj, "Value object"); + BT_ASSERT_PRE_VALUE_IS_TYPE(map_obj, BT_VALUE_TYPE_MAP); + return (int64_t) g_hash_table_size(BT_VALUE_TO_MAP(map_obj)->ght); } bt_bool bt_value_map_is_empty(const struct bt_value *map_obj) @@ -1240,107 +982,40 @@ bt_bool bt_value_map_is_empty(const struct bt_value *map_obj) return bt_value_map_size(map_obj) == 0; } -struct bt_value *bt_value_map_get(const struct bt_value *map_obj, +struct bt_value *bt_value_map_borrow(const struct bt_value *map_obj, const char *key) { - GQuark quark; - struct bt_value *ret; - struct bt_value_map *typed_map_obj = BT_VALUE_TO_MAP(map_obj); - - if (!map_obj || !key) { - BT_LOGW("Invalid parameter: value object or key is NULL: " - "value-addr=%p, key-addr=%p", map_obj, key); - ret = NULL; - goto end; - } - - if (!bt_value_is_map(map_obj)) { - BT_LOGW("Invalid parameter: value is not a map value: addr=%p, " - "type=%s", map_obj, - bt_value_type_string(map_obj->type)); - ret = NULL; - goto end; - } - - quark = g_quark_from_string(key); - ret = g_hash_table_lookup(typed_map_obj->ght, GUINT_TO_POINTER(quark)); - if (ret) { - bt_get(ret); - } - -end: - return ret; + 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); + return g_hash_table_lookup(BT_VALUE_TO_MAP(map_obj)->ght, + 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 ret; - GQuark quark; - struct bt_value_map *typed_map_obj = BT_VALUE_TO_MAP(map_obj); - - if (!map_obj || !key) { - BT_LOGW("Invalid parameter: value object or key is NULL: " - "value-addr=%p, key-addr=%p", map_obj, key); - ret = BT_FALSE; - goto end; - } - - if (!bt_value_is_map(map_obj)) { - BT_LOGW("Invalid parameter: value is not a map value: addr=%p, " - "type=%s", map_obj, - bt_value_type_string(map_obj->type)); - ret = BT_FALSE; - goto end; - } - - quark = g_quark_from_string(key); - ret = bt_g_hash_table_contains(typed_map_obj->ght, - GUINT_TO_POINTER(quark)); - -end: - return ret; + 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); + 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(struct bt_value *map_obj, const char *key, struct bt_value *element_obj) { - GQuark quark; - enum bt_value_status ret = BT_VALUE_STATUS_OK; - struct bt_value_map *typed_map_obj = BT_VALUE_TO_MAP(map_obj); - - if (!map_obj || !key || !element_obj) { - BT_LOGW("Invalid parameter: map value, key, or element value is NULL: " - "map-value-addr=%p, key-addr=%p, element-value-addr=%p", - map_obj, key, element_obj); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - if (!bt_value_is_map(map_obj)) { - BT_LOGW("Invalid parameter: value is not a map value: addr=%p, " - "type=%s", map_obj, - bt_value_type_string(map_obj->type)); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - if (map_obj->is_frozen) { - BT_LOGW("Invalid parameter: value is frozen: addr=%p", - map_obj); - ret = BT_VALUE_STATUS_FROZEN; - goto end; - } - - quark = g_quark_from_string(key); - g_hash_table_insert(typed_map_obj->ght, - GUINT_TO_POINTER(quark), 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"); + 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_LOGV("Inserted value into map value: map-value-addr=%p, " "key=\"%s\", element-value-addr=%p", map_obj, key, element_obj); - -end: - return ret; + return BT_VALUE_STATUS_OK; } enum bt_value_status bt_value_map_insert_bool(struct bt_value *map_obj, @@ -1423,36 +1098,23 @@ enum bt_value_status bt_value_map_foreach(const struct bt_value *map_obj, GHashTableIter iter; struct bt_value_map *typed_map_obj = BT_VALUE_TO_MAP(map_obj); - if (!map_obj || !cb) { - BT_LOGW("Invalid parameter: map value or callback is NULL: " - "value-addr=%p, cb-addr=%p", map_obj, cb); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - - if (!bt_value_is_map(map_obj)) { - BT_LOGW("Invalid parameter: value is not a map value: addr=%p, " - "type=%s", map_obj, - bt_value_type_string(map_obj->type)); - ret = BT_VALUE_STATUS_INVAL; - goto end; - } - + BT_ASSERT_PRE_NON_NULL(map_obj, "Value object"); + BT_ASSERT_PRE_NON_NULL(cb, "Callback"); + BT_ASSERT_PRE_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 (!cb(key_str, element_obj, data)) { - BT_LOGV("User cancelled the loop: key=\"%s\", " + BT_LOGV("User canceled the loop: key=\"%s\", " "value-addr=%p, data=%p", key_str, element_obj, data); - ret = BT_VALUE_STATUS_CANCELLED; + ret = BT_VALUE_STATUS_CANCELED; break; } } -end: return ret; } @@ -1500,27 +1162,10 @@ struct bt_value *bt_value_map_extend(struct bt_value *base_map_obj, struct bt_value *extended_obj = NULL; struct extend_map_element_data extend_data = { 0 }; - if (!base_map_obj || !extension_obj) { - BT_LOGW("Invalid parameter: base value or extension value is NULL: " - "base-value-addr=%p, extension-value-addr=%p", - base_map_obj, extension_obj); - goto error; - } - - if (!bt_value_is_map(base_map_obj)) { - BT_LOGW("Invalid parameter: value is not a map value: addr=%p, " - "type=%s", base_map_obj, - bt_value_type_string(base_map_obj->type)); - goto error; - } - - if (!bt_value_is_map(extension_obj)) { - BT_LOGW("Invalid parameter: value is not a map value: addr=%p, " - "type=%s", extension_obj, - bt_value_type_string(extension_obj->type)); - goto error; - } - + BT_ASSERT_PRE_NON_NULL(base_map_obj, "Base value object"); + BT_ASSERT_PRE_NON_NULL(extension_obj, "Extension value object"); + BT_ASSERT_PRE_VALUE_IS_TYPE(base_map_obj, BT_VALUE_TYPE_MAP); + BT_ASSERT_PRE_VALUE_IS_TYPE(extension_obj, BT_VALUE_TYPE_MAP); BT_LOGD("Extending map value: base-value-addr=%p, extension-value-addr=%p", base_map_obj, extension_obj); @@ -1540,13 +1185,13 @@ struct bt_value *bt_value_map_extend(struct bt_value *base_map_obj, if (bt_value_map_foreach(extension_obj, extend_map_element, &extend_data)) { - BT_LOGE("Cannot iterate on the extension object's elements: ", + BT_LOGE("Cannot iterate on the extension object's elements: " "extension-value-addr=%p", extension_obj); goto error; } if (extend_data.got_error) { - BT_LOGE("Failed to successfully iterate on the extension object's elements: ", + BT_LOGE("Failed to successfully iterate on the extension object's elements: " "extension-value-addr=%p", extension_obj); goto error; } @@ -1566,11 +1211,7 @@ struct bt_value *bt_value_copy(const struct bt_value *object) { struct bt_value *copy_obj = NULL; - if (!object) { - BT_LOGW_STR("Invalid parameter: value object is NULL."); - goto end; - } - + BT_ASSERT_PRE_NON_NULL(object, "Value object"); BT_LOGD("Copying value object: addr=%p", object); copy_obj = copy_funcs[object->type](object); if (copy_obj) { @@ -1580,7 +1221,6 @@ struct bt_value *bt_value_copy(const struct bt_value *object) BT_LOGE_STR("Failed to copy value object."); } -end: return copy_obj; } @@ -1589,12 +1229,8 @@ bt_bool bt_value_compare(const struct bt_value *object_a, { bt_bool ret = BT_FALSE; - if (!object_a || !object_b) { - BT_LOGW("Invalid parameter: value A or value B is NULL: " - "value-a-addr=%p, value-b-addr=%p", - object_a, object_b); - goto end; - } + BT_ASSERT_PRE_NON_NULL(object_a, "Value object A"); + BT_ASSERT_PRE_NON_NULL(object_b, "Value object B"); if (object_a->type != object_b->type) { BT_LOGV("Values are different: type mismatch: "