* SOFTWARE.
*/
+#define BT_LOG_TAG "VALUES"
+#include <babeltrace/lib-logging-internal.h>
+
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include <string.h>
#include <inttypes.h>
#include <babeltrace/compiler-internal.h>
-#include <babeltrace/object-internal.h>
#include <babeltrace/ref.h>
#include <babeltrace/values.h>
#include <babeltrace/compat/glib-internal.h>
-
-#define BT_LOG_TAG "VALUES"
-#include <babeltrace/lib-logging-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 {
struct bt_object base;
enum bt_value_type type;
- bool is_frozen;
+ bt_bool is_frozen;
};
static
.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 {
};
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 ==
}
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 ==
}
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 ==
}
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,
}
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);
object_a, object_b,
bt_value_array_size(object_a),
bt_value_array_size(object_b));
- ret = false;
+ ret = BT_FALSE;
goto end;
}
element_obj_a, element_obj_b, index);
BT_PUT(element_obj_a);
BT_PUT(element_obj_b);
- ret = false;
+ ret = BT_FALSE;
goto 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);
object_a, object_b,
bt_value_map_size(object_a),
bt_value_map_size(object_b));
- ret = false;
+ ret = BT_FALSE;
goto end;
}
"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;
}
}
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,
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)
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)) {
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;
}
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;
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)
}
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 (!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, bool_obj->type,
+ bt_value_type_string(bool_obj->type));
ret = BT_VALUE_STATUS_INVAL;
goto 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 (!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;
}
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;
}
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 (!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;
}
}
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;
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_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;
}
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;
}
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;
}
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 || !key) {
BT_LOGW("Invalid parameter: value object or key is NULL: "
"value-addr=%p, key-addr=%p", map_obj, key);
- ret = false;
+ 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 = false;
+ "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;
}
}
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;
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;
struct extend_map_element_data {
struct bt_value *extended_obj;
- bool got_error;
+ bt_bool got_error;
};
static
-bool extend_map_element(const char *key,
+bt_bool extend_map_element(const char *key,
struct bt_value *extension_obj_elem, void *data)
{
- bool ret = true;
+ bt_bool ret = BT_TRUE;
struct extend_map_element_data *extend_data = data;
goto end;
error:
- ret = false;
- extend_data->got_error = true;
+ ret = BT_FALSE;
+ extend_data->got_error = BT_TRUE;
end:
BT_PUT(extension_obj_elem_copy);
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;
}
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: "
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