#include <babeltrace/compat/glib-internal.h>
#include <babeltrace/types.h>
#include <babeltrace/object-internal.h>
+#include <babeltrace/values-internal.h>
#define BT_VALUE_FROM_CONCRETE(_concrete) ((struct bt_value *) (_concrete))
#define BT_VALUE_TO_BOOL(_base) ((struct bt_value_bool *) (_base))
struct bt_value *element_obj_copy;
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;
- }
-
+ 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",
ret = bt_value_array_append(copy_obj, element_obj_copy);
BT_PUT(element_obj_copy);
-
if (ret) {
BT_LOGE("Cannot append to array value: addr=%p",
array_obj);
}
}
- BT_LOGD("Copied array value: addr=%p", array_obj);
+ BT_LOGD("Copied array value: original-addr=%p, copy-addr=%p",
+ array_obj, copy_obj);
end:
return copy_obj;
while (g_hash_table_iter_next(&iter, &key, &element_obj)) {
const char *key_str = g_quark_to_string(GPOINTER_TO_UINT(key));
+ 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: "
"map-addr=%p, key=\"%s\"",
ret = bt_value_map_insert(copy_obj, key_str, element_obj_copy);
BT_PUT(element_obj_copy);
-
if (ret) {
BT_LOGE("Cannot insert into map value: addr=%p, key=\"%s\"",
map_obj, key_str);
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
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);
+ element_obj_a, element_obj_b, i);
BT_PUT(element_obj_a);
BT_PUT(element_obj_b);
ret = BT_FALSE;
[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,
};
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)) {
enum bt_value_type bt_value_get_type(const struct bt_value *object)
{
if (!object) {
- BT_LOGW_STR("Invalid parameter: value object is NULL.");
+ /*
+ * Not an error: user can test NULL value object with
+ * this function.
+ */
+ BT_LOGV_STR("Value object is NULL.");
return BT_VALUE_TYPE_UNKNOWN;
}
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) {
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);
+ "type=%s", bool_obj,
+ bt_value_type_string(bool_obj->type));
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);
+ "type=%s", bool_obj,
+ bt_value_type_string(bool_obj->type));
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);
+ "type=%s", integer_obj,
+ bt_value_type_string(integer_obj->type));
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);
+ "type=%s", integer_obj,
+ bt_value_type_string(integer_obj->type));
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);
+ "type=%s", float_obj,
+ bt_value_type_string(float_obj->type));
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);
+ "type=%s", float_obj,
+ bt_value_type_string(float_obj->type));
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);
+ "type=%s", string_obj,
+ bt_value_type_string(string_obj->type));
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);
+ "type=%s", string_obj,
+ bt_value_type_string(string_obj->type));
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);
+ "type=%s", array_obj,
+ bt_value_type_string(array_obj->type));
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);
+ "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,
- array_obj, index);
+ "addr=%p, index=%" PRIu64 ", size=%u",
+ array_obj, index, typed_array_obj->garray->len);
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);
+ "type=%s", array_obj,
+ bt_value_type_string(array_obj->type));
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);
+ "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,
- array_obj, index);
+ "addr=%p, index=%" PRIu64 ", size=%u",
+ array_obj, index, typed_array_obj->garray->len);
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);
+ "type=%s", map_obj,
+ bt_value_type_string(map_obj->type));
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=%d", map_obj, map_obj->type);
+ "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);
}
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);
+ "type=%s", map_obj,
+ bt_value_type_string(map_obj->type));
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);
+ "type=%s", map_obj,
+ bt_value_type_string(map_obj->type));
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);
+ "type=%s", map_obj,
+ bt_value_type_string(map_obj->type));
ret = BT_VALUE_STATUS_INVAL;
goto end;
}
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\", "
+ BT_LOGV("User cancelled the loop: key=\"%s\", "
"value-addr=%p, data=%p",
key_str, element_obj, data);
ret = BT_VALUE_STATUS_CANCELLED;
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);
+ "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=%d", extension_obj, extension_obj->type);
+ "type=%s", extension_obj,
+ bt_value_type_string(extension_obj->type));
goto error;
}
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;
}
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",
+ "value-a-type=%s, value-b-type=%s",
object_a, object_b,
- object_a->type, object_b->type);
+ bt_value_type_string(object_a->type),
+ bt_value_type_string(object_b->type));
goto end;
}
projects / babeltrace.git / blobdiff