X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fvalues.c;h=abe36fd23ba477476ea36969ba86d2efc828dfa6;hb=c55a9f585da53ea54ac458155fac3cdec1779d47;hp=5778528b4e0f3f1bdf9b60107dc63b85d0e418bd;hpb=83509119a945fc77faff869daaf48627e1c4b3fa;p=babeltrace.git diff --git a/lib/values.c b/lib/values.c index 5778528b..abe36fd2 100644 --- a/lib/values.c +++ b/lib/values.c @@ -29,11 +29,16 @@ #include #include #include -#include +#include +#include #include #include #include -#include +#include +#include + +#define BT_LOG_TAG "VALUES" +#include #define BT_VALUE_FROM_CONCRETE(_concrete) ((struct bt_value *) (_concrete)) #define BT_VALUE_TO_BOOL(_base) ((struct bt_value_bool *) (_base)) @@ -46,20 +51,28 @@ struct bt_value { struct bt_object base; enum bt_value_type type; - bool is_frozen; + bt_bool is_frozen; }; static struct bt_value bt_value_null_instance = { + .base = { + .ref_count = { + .count = 1, + .release = NULL, + }, + .release = NULL, + .parent = NULL, + }, .type = BT_VALUE_TYPE_NULL, - .is_frozen = true, + .is_frozen = BT_TRUE, }; struct bt_value *bt_value_null = &bt_value_null_instance; struct bt_value_bool { struct bt_value base; - bool value; + bt_bool value; }; struct bt_value_integer { @@ -169,10 +182,12 @@ struct bt_value *bt_value_array_copy(const struct bt_value *array_obj) struct bt_value *copy_obj; struct bt_value_array *typed_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; } @@ -181,6 +196,9 @@ struct bt_value *bt_value_array_copy(const struct bt_value *array_obj) struct bt_value *element_obj = bt_value_array_get(array_obj, i); if (!element_obj) { + BT_LOGE("Cannot get array value's element: " + "addr=%p, index=%d", + array_obj, i); BT_PUT(copy_obj); goto end; } @@ -189,6 +207,9 @@ struct bt_value *bt_value_array_copy(const struct bt_value *array_obj) BT_PUT(element_obj); if (!element_obj_copy) { + BT_LOGE("Cannot copy array value's element: " + "array-addr=%p, index=%d", + array_obj, i); BT_PUT(copy_obj); goto end; } @@ -197,11 +218,15 @@ struct bt_value *bt_value_array_copy(const struct bt_value *array_obj) BT_PUT(element_obj_copy); if (ret) { + BT_LOGE("Cannot append to array value: addr=%p", + array_obj); BT_PUT(copy_obj); goto end; } } + BT_LOGD("Copied array value: addr=%p", array_obj); + end: return copy_obj; } @@ -216,6 +241,7 @@ struct bt_value *bt_value_map_copy(const struct bt_value *map_obj) struct bt_value *element_obj_copy; struct bt_value_map *typed_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(); @@ -226,11 +252,14 @@ struct bt_value *bt_value_map_copy(const struct bt_value *map_obj) 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((unsigned long) key); + const char *key_str = g_quark_to_string(GPOINTER_TO_UINT(key)); element_obj_copy = bt_value_copy(element_obj); if (!element_obj_copy) { + BT_LOGE("Cannot copy map value's element: " + "map-addr=%p, key=\"%s\"", + map_obj, key_str); BT_PUT(copy_obj); goto end; } @@ -239,11 +268,15 @@ struct bt_value *bt_value_map_copy(const struct bt_value *map_obj) BT_PUT(element_obj_copy); if (ret) { + BT_LOGE("Cannot insert into map value: addr=%p, key=\"%s\"", + map_obj, key_str); BT_PUT(copy_obj); goto end; } } + BT_LOGD("Copied map value: addr=%p", map_obj); + end: return copy_obj; } @@ -260,19 +293,19 @@ struct bt_value *(* const copy_funcs[])(const struct bt_value *) = { }; static -bool bt_value_null_compare(const struct bt_value *object_a, +bt_bool bt_value_null_compare(const struct bt_value *object_a, const struct bt_value *object_b) { /* - * Always true since bt_value_compare() already checks if both + * Always BT_TRUE since bt_value_compare() already checks if both * object_a and object_b have the same type, and in the case of * null value objects, they're always the same if it is so. */ - return true; + return BT_TRUE; } static -bool bt_value_bool_compare(const struct bt_value *object_a, +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 == @@ -280,7 +313,7 @@ bool bt_value_bool_compare(const struct bt_value *object_a, } static -bool bt_value_integer_compare(const struct bt_value *object_a, +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 == @@ -288,7 +321,7 @@ bool bt_value_integer_compare(const struct bt_value *object_a, } static -bool bt_value_float_compare(const struct bt_value *object_a, +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 == @@ -296,7 +329,7 @@ bool bt_value_float_compare(const struct bt_value *object_a, } static -bool bt_value_string_compare(const struct bt_value *object_a, +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, @@ -304,16 +337,22 @@ bool bt_value_string_compare(const struct bt_value *object_a, } static -bool bt_value_array_compare(const struct bt_value *object_a, +bt_bool bt_value_array_compare(const struct bt_value *object_a, const struct bt_value *object_b) { int i; - bool ret = true; + bt_bool ret = BT_TRUE; 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)) { - ret = false; + 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)); + ret = BT_FALSE; goto end; } @@ -325,9 +364,12 @@ bool bt_value_array_compare(const struct bt_value *object_a, element_obj_b = bt_value_array_get(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); - ret = false; + ret = BT_FALSE; goto end; } @@ -340,16 +382,22 @@ end: } static -bool bt_value_map_compare(const struct bt_value *object_a, +bt_bool bt_value_map_compare(const struct bt_value *object_a, const struct bt_value *object_b) { - bool ret = true; + bt_bool ret = BT_TRUE; GHashTableIter iter; 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)) { - ret = false; + 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)); + ret = BT_FALSE; goto end; } @@ -357,13 +405,16 @@ bool bt_value_map_compare(const struct bt_value *object_a, while (g_hash_table_iter_next(&iter, &key, &element_obj_a)) { struct bt_value *element_obj_b; - const char *key_str = g_quark_to_string((unsigned long) key); + const char *key_str = g_quark_to_string(GPOINTER_TO_UINT(key)); element_obj_b = bt_value_map_get(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 = false; + ret = BT_FALSE; goto end; } @@ -375,7 +426,7 @@ end: } static -bool (* const compare_funcs[])(const struct bt_value *, +bt_bool (* const compare_funcs[])(const struct bt_value *, const struct bt_value *) = { [BT_VALUE_TYPE_NULL] = bt_value_null_compare, [BT_VALUE_TYPE_BOOL] = bt_value_bool_compare, @@ -392,7 +443,7 @@ void bt_value_null_freeze(struct bt_value *object) void bt_value_generic_freeze(struct bt_value *object) { - object->is_frozen = true; + object->is_frozen = BT_TRUE; } void bt_value_array_freeze(struct bt_value *object) @@ -445,7 +496,10 @@ void bt_value_destroy(struct bt_object *obj) value = container_of(obj, struct bt_value, base); assert(value->type != BT_VALUE_TYPE_UNKNOWN); + BT_LOGD("Destroying value: addr=%p", value); + if (bt_value_is_null(value)) { + BT_LOGD_STR("Not destroying the null value singleton."); return; } @@ -461,17 +515,23 @@ 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; } + if (object->is_frozen) { + goto end; + } + + BT_LOGD("Freezing value: addr=%p", object); freeze_funcs[object->type](object); end: return ret; } -bool bt_value_is_frozen(const struct bt_value *object) +bt_bool bt_value_is_frozen(const struct bt_value *object) { return object && object->is_frozen; } @@ -479,6 +539,7 @@ bool bt_value_is_frozen(const struct bt_value *object) 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; } @@ -491,24 +552,26 @@ struct bt_value bt_value_create_base(enum bt_value_type type) struct bt_value base; base.type = type; - base.is_frozen = false; + base.is_frozen = BT_FALSE; bt_object_init(&base, bt_value_destroy); - return base; } -struct bt_value *bt_value_bool_create_init(bool val) +struct bt_value *bt_value_bool_create_init(bt_bool val) { struct bt_value_bool *bool_obj; + 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; } bool_obj->base = bt_value_create_base(BT_VALUE_TYPE_BOOL); bool_obj->value = val; + BT_LOGD("Created boolean value object: addr=%p", bool_obj); end: return BT_VALUE_FROM_CONCRETE(bool_obj); @@ -516,21 +579,25 @@ end: struct bt_value *bt_value_bool_create(void) { - return bt_value_bool_create_init(false); + return bt_value_bool_create_init(BT_FALSE); } struct bt_value *bt_value_integer_create_init(int64_t val) { struct bt_value_integer *integer_obj; + 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; } integer_obj->base = bt_value_create_base(BT_VALUE_TYPE_INTEGER); integer_obj->value = val; + BT_LOGD("Created integer value object: addr=%p", + integer_obj); end: return BT_VALUE_FROM_CONCRETE(integer_obj); @@ -545,14 +612,18 @@ struct bt_value *bt_value_float_create_init(double val) { struct bt_value_float *float_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."); 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); end: return BT_VALUE_FROM_CONCRETE(float_obj); @@ -568,12 +639,15 @@ 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_LOGD("Creating string value object: val-len=%u", 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; } @@ -581,11 +655,15 @@ struct bt_value *bt_value_string_create_init(const char *val) string_obj->gstr = g_string_new(val); if (!string_obj->gstr) { + BT_LOGE_STR("Failed to allocate a GString."); g_free(string_obj); string_obj = NULL; goto end; } + BT_LOGD("Created string value object: addr=%p", + string_obj); + end: return BT_VALUE_FROM_CONCRETE(string_obj); } @@ -599,22 +677,28 @@ struct bt_value *bt_value_array_create(void) { struct bt_value_array *array_obj; + 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; } array_obj->base = bt_value_create_base(BT_VALUE_TYPE_ARRAY); - array_obj->garray = g_ptr_array_new_full(0, + 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); array_obj = NULL; goto end; } + BT_LOGD("Created array value object: addr=%p", + array_obj); + end: return BT_VALUE_FROM_CONCRETE(array_obj); } @@ -623,9 +707,11 @@ struct bt_value *bt_value_map_create(void) { struct bt_value_map *map_obj; + 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; } @@ -634,22 +720,36 @@ struct bt_value *bt_value_map_create(void) NULL, (GDestroyNotify) bt_put); if (!map_obj->ght) { + BT_LOGE_STR("Failed to allocate a GHashTable."); g_free(map_obj); map_obj = NULL; goto end; } + BT_LOGD("Created map value object: addr=%p", + map_obj); + end: return BT_VALUE_FROM_CONCRETE(map_obj); } enum bt_value_status bt_value_bool_get(const struct bt_value *bool_obj, - bool *val) + 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_value_is_bool(bool_obj) || !val) { + 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=%d", bool_obj, bool_obj->type); ret = BT_VALUE_STATUS_INVAL; goto end; } @@ -660,35 +760,57 @@ end: return ret; } -enum bt_value_status bt_value_bool_set(struct bt_value *bool_obj, bool val) +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_value_is_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=%d", bool_obj, 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_LOGV("Set boolean value's raw value: value-addr=%p, value=%d", + bool_obj, val); end: return ret; } enum bt_value_status bt_value_integer_get(const struct bt_value *integer_obj, - int64_t *val) + 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_value_is_integer(integer_obj) || !val) { + 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=%d", integer_obj, integer_obj->type); ret = BT_VALUE_STATUS_INVAL; goto end; } @@ -700,36 +822,58 @@ end: } enum bt_value_status bt_value_integer_set(struct bt_value *integer_obj, - int64_t val) + 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_value_is_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=%d", integer_obj, 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_LOGV("Set integer value's raw value: value-addr=%p, value=%" PRId64, + integer_obj, val); end: return ret; } enum bt_value_status bt_value_float_get(const struct bt_value *float_obj, - double *val) + 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_value_is_float(float_obj) || !val) { + 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=%d", float_obj, float_obj->type); ret = BT_VALUE_STATUS_INVAL; goto end; } @@ -741,36 +885,58 @@ end: } enum bt_value_status bt_value_float_set(struct bt_value *float_obj, - double val) + 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_value_is_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=%d", float_obj, 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_LOGV("Set floating point number value's raw value: value-addr=%p, value=%f", + float_obj, val); end: return ret; } enum bt_value_status bt_value_string_get(const struct bt_value *string_obj, - const char **val) + 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 || !bt_value_is_string(string_obj) || !val) { + 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=%d", string_obj, string_obj->type); ret = BT_VALUE_STATUS_INVAL; goto end; } @@ -782,59 +948,97 @@ end: } enum bt_value_status bt_value_string_set(struct bt_value *string_obj, - const char *val) + 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 || !bt_value_is_string(string_obj) || !val) { + 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=%d", string_obj, 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_LOGV("Set string value's raw value: value-addr=%p, raw-value-addr=%p", + string_obj, val); end: return ret; } -int bt_value_array_size(const struct bt_value *array_obj) +int64_t bt_value_array_size(const struct bt_value *array_obj) { - int ret; + int64_t ret; struct bt_value_array *typed_array_obj = BT_VALUE_TO_ARRAY(array_obj); - if (!array_obj || !bt_value_is_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=%d", array_obj, array_obj->type); ret = BT_VALUE_STATUS_INVAL; goto end; } - ret = (int) typed_array_obj->garray->len; + ret = (int64_t) typed_array_obj->garray->len; end: return ret; } -bool bt_value_array_is_empty(const struct bt_value *array_obj) +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, - size_t index) + uint64_t index) { struct bt_value *ret; struct bt_value_array *typed_array_obj = BT_VALUE_TO_ARRAY(array_obj); - if (!array_obj || !bt_value_is_array(array_obj) || - index >= typed_array_obj->garray->len) { + 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=%d", array_obj, 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, + array_obj, index); ret = NULL; goto end; } @@ -847,31 +1051,46 @@ end: } enum bt_value_status bt_value_array_append(struct bt_value *array_obj, - struct bt_value *element_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 || !bt_value_is_array(array_obj) || !element_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=%d", array_obj, 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; } 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; } enum bt_value_status bt_value_array_append_bool(struct bt_value *array_obj, - bool val) + bt_bool val) { enum bt_value_status ret; struct bt_value *bool_obj = NULL; @@ -879,12 +1098,11 @@ enum bt_value_status bt_value_array_append_bool(struct bt_value *array_obj, bool_obj = bt_value_bool_create_init(val); ret = bt_value_array_append(array_obj, bool_obj); bt_put(bool_obj); - return ret; } enum bt_value_status bt_value_array_append_integer( - struct bt_value *array_obj, int64_t val) + struct bt_value *array_obj, int64_t val) { enum bt_value_status ret; struct bt_value *integer_obj = NULL; @@ -892,12 +1110,11 @@ enum bt_value_status bt_value_array_append_integer( integer_obj = bt_value_integer_create_init(val); ret = bt_value_array_append(array_obj, integer_obj); bt_put(integer_obj); - return ret; } enum bt_value_status bt_value_array_append_float(struct bt_value *array_obj, - double val) + double val) { enum bt_value_status ret; struct bt_value *float_obj = NULL; @@ -905,12 +1122,11 @@ enum bt_value_status bt_value_array_append_float(struct bt_value *array_obj, float_obj = bt_value_float_create_init(val); ret = bt_value_array_append(array_obj, float_obj); bt_put(float_obj); - return ret; } enum bt_value_status bt_value_array_append_string(struct bt_value *array_obj, - const char *val) + const char *val) { enum bt_value_status ret; struct bt_value *string_obj = NULL; @@ -918,11 +1134,11 @@ enum bt_value_status bt_value_array_append_string(struct bt_value *array_obj, string_obj = bt_value_string_create_init(val); ret = bt_value_array_append(array_obj, string_obj); bt_put(string_obj); - return ret; } -enum bt_value_status bt_value_array_append_array(struct bt_value *array_obj) +enum bt_value_status bt_value_array_append_empty_array( + struct bt_value *array_obj) { enum bt_value_status ret; struct bt_value *empty_array_obj = NULL; @@ -930,11 +1146,10 @@ enum bt_value_status bt_value_array_append_array(struct bt_value *array_obj) empty_array_obj = bt_value_array_create(); ret = bt_value_array_append(array_obj, empty_array_obj); bt_put(empty_array_obj); - return ret; } -enum bt_value_status bt_value_array_append_map(struct bt_value *array_obj) +enum bt_value_status bt_value_array_append_empty_map(struct bt_value *array_obj) { enum bt_value_status ret; struct bt_value *map_obj = NULL; @@ -942,24 +1157,42 @@ enum bt_value_status bt_value_array_append_map(struct bt_value *array_obj) map_obj = bt_value_map_create(); ret = bt_value_array_append(array_obj, map_obj); bt_put(map_obj); - return ret; } enum bt_value_status bt_value_array_set(struct bt_value *array_obj, - size_t index, struct bt_value *element_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 || !bt_value_is_array(array_obj) || !element_obj || - index >= typed_array_obj->garray->len) { + 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=%d", array_obj, 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, + array_obj, index); 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; } @@ -967,40 +1200,60 @@ enum bt_value_status bt_value_array_set(struct bt_value *array_obj, 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; } -int bt_value_map_size(const struct bt_value *map_obj) +int64_t bt_value_map_size(const struct bt_value *map_obj) { - int ret; + int64_t ret; struct bt_value_map *typed_map_obj = BT_VALUE_TO_MAP(map_obj); - if (!map_obj || !bt_value_is_map(map_obj)) { - ret = BT_VALUE_STATUS_INVAL; + if (!map_obj) { + BT_LOGW_STR("Invalid parameter: value object is NULL."); + ret = (int64_t) BT_VALUE_STATUS_INVAL; goto end; } - ret = (int) g_hash_table_size(typed_map_obj->ght); + if (!bt_value_is_map(map_obj)) { + BT_LOGW("Invalid parameter: value is not a map value: addr=%p, " + "type=%d", map_obj, 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; } -bool bt_value_map_is_empty(const struct bt_value *map_obj) +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, - const char *key) + 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 || !bt_value_is_map(map_obj) || !key) { + 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=%d", map_obj, map_obj->type); ret = NULL; goto end; } @@ -1016,19 +1269,28 @@ end: return ret; } -bool bt_value_map_has_key(const struct bt_value *map_obj, const char *key) +bt_bool bt_value_map_has_key(const struct bt_value *map_obj, const char *key) { - bool ret; + bt_bool ret; GQuark quark; struct bt_value_map *typed_map_obj = BT_VALUE_TO_MAP(map_obj); - if (!map_obj || !bt_value_is_map(map_obj) || !key) { - ret = false; + 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=%d", map_obj, map_obj->type); + ret = BT_FALSE; goto end; } quark = g_quark_from_string(key); - ret = g_hash_table_contains(typed_map_obj->ght, + ret = bt_g_hash_table_contains(typed_map_obj->ght, GUINT_TO_POINTER(quark)); end: @@ -1036,18 +1298,30 @@ end: } enum bt_value_status bt_value_map_insert(struct bt_value *map_obj, - const char *key, struct bt_value *element_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 || !bt_value_is_map(map_obj) || !key || !element_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=%d", map_obj, 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; } @@ -1056,13 +1330,16 @@ enum bt_value_status bt_value_map_insert(struct bt_value *map_obj, g_hash_table_insert(typed_map_obj->ght, GUINT_TO_POINTER(quark), 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; } enum bt_value_status bt_value_map_insert_bool(struct bt_value *map_obj, - const char *key, bool val) + const char *key, bt_bool val) { enum bt_value_status ret; struct bt_value *bool_obj = NULL; @@ -1070,12 +1347,11 @@ enum bt_value_status bt_value_map_insert_bool(struct bt_value *map_obj, bool_obj = bt_value_bool_create_init(val); ret = bt_value_map_insert(map_obj, key, bool_obj); bt_put(bool_obj); - return ret; } enum bt_value_status bt_value_map_insert_integer(struct bt_value *map_obj, - const char *key, int64_t val) + const char *key, int64_t val) { enum bt_value_status ret; struct bt_value *integer_obj = NULL; @@ -1083,12 +1359,11 @@ enum bt_value_status bt_value_map_insert_integer(struct bt_value *map_obj, integer_obj = bt_value_integer_create_init(val); ret = bt_value_map_insert(map_obj, key, integer_obj); bt_put(integer_obj); - return ret; } enum bt_value_status bt_value_map_insert_float(struct bt_value *map_obj, - const char *key, double val) + const char *key, double val) { enum bt_value_status ret; struct bt_value *float_obj = NULL; @@ -1096,12 +1371,11 @@ enum bt_value_status bt_value_map_insert_float(struct bt_value *map_obj, float_obj = bt_value_float_create_init(val); ret = bt_value_map_insert(map_obj, key, float_obj); bt_put(float_obj); - return ret; } enum bt_value_status bt_value_map_insert_string(struct bt_value *map_obj, - const char *key, const char *val) + const char *key, const char *val) { enum bt_value_status ret; struct bt_value *string_obj = NULL; @@ -1109,12 +1383,11 @@ enum bt_value_status bt_value_map_insert_string(struct bt_value *map_obj, string_obj = bt_value_string_create_init(val); ret = bt_value_map_insert(map_obj, key, string_obj); bt_put(string_obj); - return ret; } -enum bt_value_status bt_value_map_insert_array(struct bt_value *map_obj, - const char *key) +enum bt_value_status bt_value_map_insert_empty_array(struct bt_value *map_obj, + const char *key) { enum bt_value_status ret; struct bt_value *array_obj = NULL; @@ -1122,12 +1395,11 @@ enum bt_value_status bt_value_map_insert_array(struct bt_value *map_obj, array_obj = bt_value_array_create(); ret = bt_value_map_insert(map_obj, key, array_obj); bt_put(array_obj); - return ret; } -enum bt_value_status bt_value_map_insert_map(struct bt_value *map_obj, - const char *key) +enum bt_value_status bt_value_map_insert_empty_map(struct bt_value *map_obj, + const char *key) { enum bt_value_status ret; struct bt_value *empty_map_obj = NULL; @@ -1135,19 +1407,27 @@ enum bt_value_status bt_value_map_insert_map(struct bt_value *map_obj, empty_map_obj = bt_value_map_create(); ret = bt_value_map_insert(map_obj, key, empty_map_obj); bt_put(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) + bt_value_map_foreach_cb cb, void *data) { enum bt_value_status ret = BT_VALUE_STATUS_OK; gpointer key, element_obj; GHashTableIter iter; struct bt_value_map *typed_map_obj = BT_VALUE_TO_MAP(map_obj); - if (!map_obj || !bt_value_is_map(map_obj) || !cb) { + 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=%d", map_obj, map_obj->type); ret = BT_VALUE_STATUS_INVAL; goto end; } @@ -1155,9 +1435,12 @@ enum bt_value_status bt_value_map_foreach(const struct bt_value *map_obj, 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((unsigned long) key); + const char *key_str = g_quark_to_string(GPOINTER_TO_UINT(key)); if (!cb(key_str, element_obj, data)) { + BT_LOGD("User cancelled the loop: key=\"%s\", " + "value-addr=%p, data=%p", + key_str, element_obj, data); ret = BT_VALUE_STATUS_CANCELLED; break; } @@ -1167,30 +1450,150 @@ end: return ret; } +struct extend_map_element_data { + struct bt_value *extended_obj; + bt_bool got_error; +}; + +static +bt_bool extend_map_element(const char *key, + struct bt_value *extension_obj_elem, void *data) +{ + bt_bool ret = BT_TRUE; + + struct extend_map_element_data *extend_data = data; + + /* Copy object which is to replace the current one */ + struct bt_value *extension_obj_elem_copy = + bt_value_copy(extension_obj_elem); + + /* Replace in extended object */ + if (bt_value_map_insert(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", + key, extend_data->extended_obj, + extension_obj_elem_copy); + goto error; + } + + goto end; + +error: + ret = BT_FALSE; + extend_data->got_error = BT_TRUE; + +end: + BT_PUT(extension_obj_elem_copy); + return ret; +} + +struct bt_value *bt_value_map_extend(struct bt_value *base_map_obj, + struct bt_value *extension_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=%d", base_map_obj, 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=%d", extension_obj, extension_obj->type); + goto error; + } + + BT_LOGD("Extending map value: base-value-addr=%p, extension-value-addr=%p", + base_map_obj, extension_obj); + + /* Create copy of base map object to start with */ + extended_obj = bt_value_copy(base_map_obj); + if (!extended_obj) { + BT_LOGE("Cannot copy base value: base-value-addr=%p", + base_map_obj); + goto error; + } + + /* + * For each key in the extension map object, replace this key + * in the copied map object. + */ + extend_data.extended_obj = extended_obj; + + if (bt_value_map_foreach(extension_obj, extend_map_element, + &extend_data)) { + 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: ", + "extension-value-addr=%p", extension_obj); + goto error; + } + + BT_LOGD("Extended map value: extended-value-addr=%p", + extended_obj); + goto end; + +error: + BT_PUT(extended_obj); + +end: + return extended_obj; +} + 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_LOGD("Copying value object: addr=%p", object); copy_obj = copy_funcs[object->type](object); + if (copy_obj) { + BT_LOGD("Copied value object: copy-value-addr=%p", + copy_obj); + } else { + BT_LOGE_STR("Failed to copy value object."); + } end: return copy_obj; } -bool bt_value_compare(const struct bt_value *object_a, +bt_bool bt_value_compare(const struct bt_value *object_a, const struct bt_value *object_b) { - bool ret = false; + 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; } if (object_a->type != object_b->type) { + BT_LOGV("Values are different: type mismatch: " + "value-a-addr=%p, value-b-addr=%p, " + "value-a-type=%d, value-b-type=%d", + object_a, object_b, + object_a->type, object_b->type); goto end; }