/*
+ * SPDX-License-Identifier: MIT
+ *
* Copyright (c) 2015 EfficiOS Inc. and Linux Foundation
* Copyright (c) 2015 Philippe Proulx <pproulx@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
*/
#define BT_LOG_TAG "CTF-WRITER/VALUES"
#include <string.h>
#include <inttypes.h>
-#include <babeltrace2/ctf-writer/object.h>
+#include <babeltrace2-ctf-writer/object.h>
#include <babeltrace2/types.h>
#include "common/assert.h"
struct bt_ctf_value {
struct bt_ctf_object base;
enum bt_ctf_value_type type;
- bt_bool frozen;
+ bt_ctf_bool frozen;
};
static
.parent = NULL,
},
.type = BT_CTF_VALUE_TYPE_NULL,
- .frozen = BT_TRUE,
+ .frozen = BT_CTF_TRUE,
};
struct bt_ctf_value *const bt_ctf_value_null = &bt_ctf_value_null_instance;
struct bt_ctf_value_bool {
struct bt_ctf_value base;
- bt_bool value;
+ bt_ctf_bool value;
};
struct bt_ctf_value_integer {
bt_ctf_value_array_borrow_element_by_index(
array_obj, i);
- BT_ASSERT(element_obj);
+ BT_ASSERT_DBG(element_obj);
BT_LOGD("Copying array value's element: element-addr=%p, "
"index=%d", element_obj, i);
ret = bt_ctf_value_copy(&element_obj_copy, element_obj);
goto end;
}
- BT_ASSERT(element_obj_copy);
+ BT_ASSERT_DBG(element_obj_copy);
ret = bt_ctf_private_value_array_append_element(copy_obj,
(void *) element_obj_copy);
BT_CTF_OBJECT_PUT_REF_AND_RESET(element_obj_copy);
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_ASSERT_DBG(key_str);
BT_LOGD("Copying map value's element: element-addr=%p, "
"key=\"%s\"", element_obj, key_str);
ret = bt_ctf_value_copy(&element_obj_copy, element_obj);
goto end;
}
- BT_ASSERT(element_obj_copy);
+ BT_ASSERT_DBG(element_obj_copy);
ret = bt_ctf_private_value_map_insert_entry(copy_obj, key_str,
(void *) element_obj_copy);
BT_CTF_OBJECT_PUT_REF_AND_RESET(element_obj_copy);
};
static
-bt_bool bt_ctf_value_null_compare(const struct bt_ctf_value *object_a,
+bt_ctf_bool bt_ctf_value_null_compare(const struct bt_ctf_value *object_a,
const struct bt_ctf_value *object_b)
{
/*
- * Always BT_TRUE since bt_ctf_value_compare() already checks if both
+ * Always BT_CTF_TRUE since bt_ctf_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 BT_TRUE;
+ return BT_CTF_TRUE;
}
static
-bt_bool bt_ctf_value_bool_compare(const struct bt_ctf_value *object_a,
+bt_ctf_bool bt_ctf_value_bool_compare(const struct bt_ctf_value *object_a,
const struct bt_ctf_value *object_b)
{
if (BT_CTF_VALUE_TO_BOOL(object_a)->value !=
BT_CTF_VALUE_TO_BOOL(object_b)->value) {
- BT_LOGV("Boolean value objects are different: "
+ BT_LOGT("Boolean value objects are different: "
"bool-a-val=%d, bool-b-val=%d",
BT_CTF_VALUE_TO_BOOL(object_a)->value,
BT_CTF_VALUE_TO_BOOL(object_b)->value);
- return BT_FALSE;
+ return BT_CTF_FALSE;
}
- return BT_TRUE;
+ return BT_CTF_TRUE;
}
static
-bt_bool bt_ctf_value_integer_compare(const struct bt_ctf_value *object_a,
+bt_ctf_bool bt_ctf_value_integer_compare(const struct bt_ctf_value *object_a,
const struct bt_ctf_value *object_b)
{
if (BT_CTF_VALUE_TO_INTEGER(object_a)->value !=
BT_CTF_VALUE_TO_INTEGER(object_b)->value) {
- BT_LOGV("Integer value objects are different: "
+ BT_LOGT("Integer value objects are different: "
"int-a-val=%" PRId64 ", int-b-val=%" PRId64,
BT_CTF_VALUE_TO_INTEGER(object_a)->value,
BT_CTF_VALUE_TO_INTEGER(object_b)->value);
- return BT_FALSE;
+ return BT_CTF_FALSE;
}
- return BT_TRUE;
+ return BT_CTF_TRUE;
}
static
-bt_bool bt_ctf_value_real_compare(const struct bt_ctf_value *object_a,
+bt_ctf_bool bt_ctf_value_real_compare(const struct bt_ctf_value *object_a,
const struct bt_ctf_value *object_b)
{
if (BT_CTF_VALUE_TO_REAL(object_a)->value !=
BT_CTF_VALUE_TO_REAL(object_b)->value) {
- BT_LOGV("Real number value objects are different: "
+ BT_LOGT("Real number value objects are different: "
"real-a-val=%f, real-b-val=%f",
BT_CTF_VALUE_TO_REAL(object_a)->value,
BT_CTF_VALUE_TO_REAL(object_b)->value);
- return BT_FALSE;
+ return BT_CTF_FALSE;
}
- return BT_TRUE;
+ return BT_CTF_TRUE;
}
static
-bt_bool bt_ctf_value_string_compare(const struct bt_ctf_value *object_a,
+bt_ctf_bool bt_ctf_value_string_compare(const struct bt_ctf_value *object_a,
const struct bt_ctf_value *object_b)
{
if (strcmp(BT_CTF_VALUE_TO_STRING(object_a)->gstr->str,
BT_CTF_VALUE_TO_STRING(object_b)->gstr->str) != 0) {
- BT_LOGV("String value objects are different: "
+ BT_LOGT("String value objects are different: "
"string-a-val=\"%s\", string-b-val=\"%s\"",
BT_CTF_VALUE_TO_STRING(object_a)->gstr->str,
BT_CTF_VALUE_TO_STRING(object_b)->gstr->str);
- return BT_FALSE;
+ return BT_CTF_FALSE;
}
- return BT_TRUE;
+ return BT_CTF_TRUE;
}
static
-bt_bool bt_ctf_value_array_compare(const struct bt_ctf_value *object_a,
+bt_ctf_bool bt_ctf_value_array_compare(const struct bt_ctf_value *object_a,
const struct bt_ctf_value *object_b)
{
int i;
- bt_bool ret = BT_TRUE;
+ bt_ctf_bool ret = BT_CTF_TRUE;
const struct bt_ctf_value_array *array_obj_a =
BT_CTF_VALUE_TO_ARRAY(object_a);
- if (bt_ctf_value_array_get_size(object_a) !=
- bt_ctf_value_array_get_size(object_b)) {
- BT_LOGV("Array values are different: size mismatch "
+ if (bt_ctf_value_array_get_length(object_a) !=
+ bt_ctf_value_array_get_length(object_b)) {
+ BT_LOGT("Array values are different: size mismatch "
"value-a-addr=%p, value-b-addr=%p, "
"value-a-size=%" PRId64 ", value-b-size=%" PRId64,
object_a, object_b,
- bt_ctf_value_array_get_size(object_a),
- bt_ctf_value_array_get_size(object_b));
- ret = BT_FALSE;
+ bt_ctf_value_array_get_length(object_a),
+ bt_ctf_value_array_get_length(object_b));
+ ret = BT_CTF_FALSE;
goto end;
}
object_b, i);
if (!bt_ctf_value_compare(element_obj_a, element_obj_b)) {
- BT_LOGV("Array values's elements are different: "
+ BT_LOGT("Array values's elements are different: "
"value-a-addr=%p, value-b-addr=%p, index=%d",
element_obj_a, element_obj_b, i);
- ret = BT_FALSE;
+ ret = BT_CTF_FALSE;
goto end;
}
}
}
static
-bt_bool bt_ctf_value_map_compare(const struct bt_ctf_value *object_a,
+bt_ctf_bool bt_ctf_value_map_compare(const struct bt_ctf_value *object_a,
const struct bt_ctf_value *object_b)
{
- bt_bool ret = BT_TRUE;
+ bt_ctf_bool ret = BT_CTF_TRUE;
GHashTableIter iter;
gpointer key, element_obj_a;
const struct bt_ctf_value_map *map_obj_a = BT_CTF_VALUE_TO_MAP(object_a);
if (bt_ctf_value_map_get_size(object_a) !=
bt_ctf_value_map_get_size(object_b)) {
- BT_LOGV("Map values are different: size mismatch "
+ BT_LOGT("Map values are different: size mismatch "
"value-a-addr=%p, value-b-addr=%p, "
"value-a-size=%" PRId64 ", value-b-size=%" PRId64,
object_a, object_b,
bt_ctf_value_map_get_size(object_a),
bt_ctf_value_map_get_size(object_b));
- ret = BT_FALSE;
+ ret = BT_CTF_FALSE;
goto end;
}
key_str);
if (!bt_ctf_value_compare(element_obj_a, element_obj_b)) {
- BT_LOGV("Map values's elements are different: "
+ BT_LOGT("Map values's elements are different: "
"value-a-addr=%p, value-b-addr=%p, key=\"%s\"",
element_obj_a, element_obj_b, key_str);
- ret = BT_FALSE;
+ ret = BT_CTF_FALSE;
goto end;
}
}
}
static
-bt_bool (* const compare_funcs[])(const struct bt_ctf_value *,
+bt_ctf_bool (* const compare_funcs[])(const struct bt_ctf_value *,
const struct bt_ctf_value *) = {
[BT_CTF_VALUE_TYPE_NULL] = bt_ctf_value_null_compare,
[BT_CTF_VALUE_TYPE_BOOL] = bt_ctf_value_bool_compare,
static
void bt_ctf_value_generic_freeze(struct bt_ctf_value *object)
{
- object->frozen = BT_TRUE;
+ object->frozen = BT_CTF_TRUE;
}
static
{
enum bt_ctf_value_status ret = BT_CTF_VALUE_STATUS_OK;
- BT_ASSERT(object);
+ BT_ASSERT_DBG(object);
if (object->frozen) {
goto end;
struct bt_ctf_value value;
value.type = type;
- value.frozen = BT_FALSE;
+ value.frozen = BT_CTF_FALSE;
bt_ctf_object_init_shared(&value.base, bt_ctf_value_destroy);
return value;
}
BT_HIDDEN
-struct bt_ctf_private_value *bt_ctf_private_value_bool_create_init(bt_bool val)
+struct bt_ctf_private_value *bt_ctf_private_value_bool_create_init(bt_ctf_bool val)
{
struct bt_ctf_value_bool *bool_obj;
BT_HIDDEN
struct bt_ctf_private_value *bt_ctf_private_value_bool_create(void)
{
- return bt_ctf_private_value_bool_create_init(BT_FALSE);
+ return bt_ctf_private_value_bool_create_init(BT_CTF_FALSE);
}
BT_HIDDEN
}
BT_HIDDEN
-bt_bool bt_ctf_value_bool_get(const struct bt_ctf_value *bool_obj)
+bt_ctf_bool bt_ctf_value_bool_get(const struct bt_ctf_value *bool_obj)
{
BT_CTF_ASSERT_PRE_NON_NULL(bool_obj, "Value object");
BT_CTF_ASSERT_PRE_VALUE_IS_TYPE(bool_obj, BT_CTF_VALUE_TYPE_BOOL);
}
BT_HIDDEN
-void bt_ctf_private_value_bool_set(struct bt_ctf_private_value *bool_obj, bt_bool val)
+void bt_ctf_private_value_bool_set(struct bt_ctf_private_value *bool_obj, bt_ctf_bool val)
{
BT_CTF_ASSERT_PRE_NON_NULL(bool_obj, "Value object");
BT_CTF_ASSERT_PRE_VALUE_IS_TYPE(bool_obj, BT_CTF_VALUE_TYPE_BOOL);
BT_CTF_ASSERT_PRE_VALUE_HOT(bool_obj, "Value object");
BT_CTF_VALUE_TO_BOOL(bool_obj)->value = val;
- BT_LOGV("Set boolean value's raw value: value-addr=%p, value=%d",
+ BT_LOGT("Set boolean value's raw value: value-addr=%p, value=%d",
bool_obj, val);
}
BT_CTF_ASSERT_PRE_VALUE_IS_TYPE(integer_obj, BT_CTF_VALUE_TYPE_INTEGER);
BT_CTF_ASSERT_PRE_VALUE_HOT(integer_obj, "Value object");
BT_CTF_VALUE_TO_INTEGER(integer_obj)->value = val;
- BT_LOGV("Set integer value's raw value: value-addr=%p, value=%" PRId64,
+ BT_LOGT("Set integer value's raw value: value-addr=%p, value=%" PRId64,
integer_obj, val);
}
BT_CTF_ASSERT_PRE_VALUE_IS_TYPE(real_obj, BT_CTF_VALUE_TYPE_REAL);
BT_CTF_ASSERT_PRE_VALUE_HOT(real_obj, "Value object");
BT_CTF_VALUE_TO_REAL(real_obj)->value = val;
- BT_LOGV("Set real number value's raw value: value-addr=%p, value=%f",
+ BT_LOGT("Set real number value's raw value: value-addr=%p, value=%f",
real_obj, val);
}
BT_CTF_ASSERT_PRE_VALUE_IS_TYPE(string_obj, BT_CTF_VALUE_TYPE_STRING);
BT_CTF_ASSERT_PRE_VALUE_HOT(string_obj, "Value object");
g_string_assign(BT_CTF_VALUE_TO_STRING(string_obj)->gstr, val);
- BT_LOGV("Set string value's raw value: value-addr=%p, raw-value-addr=%p",
+ BT_LOGT("Set string value's raw value: value-addr=%p, raw-value-addr=%p",
string_obj, val);
return BT_CTF_VALUE_STATUS_OK;
}
BT_HIDDEN
-uint64_t bt_ctf_value_array_get_size(const struct bt_ctf_value *array_obj)
+uint64_t bt_ctf_value_array_get_length(const struct bt_ctf_value *array_obj)
{
BT_CTF_ASSERT_PRE_NON_NULL(array_obj, "Value object");
BT_CTF_ASSERT_PRE_VALUE_IS_TYPE(array_obj, BT_CTF_VALUE_TYPE_ARRAY);
BT_CTF_ASSERT_PRE_VALUE_HOT(array_obj, "Array value object");
g_ptr_array_add(typed_array_obj->garray, element_obj);
bt_ctf_object_get_ref(element_obj);
- BT_LOGV("Appended element to array value: array-value-addr=%p, "
+ BT_LOGT("Appended element to array value: array-value-addr=%p, "
"element-value-addr=%p, new-size=%u",
array_obj, element_obj, typed_array_obj->garray->len);
return BT_CTF_VALUE_STATUS_OK;
BT_HIDDEN
enum bt_ctf_value_status bt_ctf_private_value_array_append_bool_element(
- struct bt_ctf_private_value *array_obj, bt_bool val)
+ struct bt_ctf_private_value *array_obj, bt_ctf_bool val)
{
enum bt_ctf_value_status ret;
struct bt_ctf_private_value *bool_obj = NULL;
bt_ctf_object_put_ref(g_ptr_array_index(typed_array_obj->garray, index));
g_ptr_array_index(typed_array_obj->garray, index) = element_obj;
bt_ctf_object_get_ref(element_obj);
- BT_LOGV("Set array value's element: array-value-addr=%p, "
+ BT_LOGT("Set array value's element: array-value-addr=%p, "
"index=%" PRIu64 ", element-value-addr=%p",
array_obj, index, element_obj);
return BT_CTF_VALUE_STATUS_OK;
}
BT_HIDDEN
-bt_bool bt_ctf_value_map_has_entry(const struct bt_ctf_value *map_obj, const char *key)
+bt_ctf_bool bt_ctf_value_map_has_entry(const struct bt_ctf_value *map_obj, const char *key)
{
BT_CTF_ASSERT_PRE_NON_NULL(map_obj, "Value object");
BT_CTF_ASSERT_PRE_NON_NULL(key, "Key");
g_hash_table_insert(BT_CTF_VALUE_TO_MAP(map_obj)->ght,
GUINT_TO_POINTER(g_quark_from_string(key)), element_obj);
bt_ctf_object_get_ref(element_obj);
- BT_LOGV("Inserted value into map value: map-value-addr=%p, "
+ BT_LOGT("Inserted value into map value: map-value-addr=%p, "
"key=\"%s\", element-value-addr=%p",
map_obj, key, element_obj);
return BT_CTF_VALUE_STATUS_OK;
BT_HIDDEN
enum bt_ctf_value_status bt_ctf_private_value_map_insert_bool_entry(
- struct bt_ctf_private_value *map_obj, const char *key, bt_bool val)
+ struct bt_ctf_private_value *map_obj, const char *key, bt_ctf_bool val)
{
enum bt_ctf_value_status ret;
struct bt_ctf_private_value *bool_obj = NULL;
const char *key_str = g_quark_to_string(GPOINTER_TO_UINT(key));
if (!cb(key_str, element_obj, data)) {
- BT_LOGV("User canceled the loop: key=\"%s\", "
+ BT_LOGT("User canceled the loop: key=\"%s\", "
"value-addr=%p, data=%p",
key_str, element_obj, data);
ret = BT_CTF_VALUE_STATUS_CANCELED;
};
static
-bt_bool extend_map_element(const char *key,
+bt_ctf_bool extend_map_element(const char *key,
struct bt_ctf_value *extension_obj_elem, void *data)
{
- bt_bool ret = BT_TRUE;
+ bt_ctf_bool ret = BT_CTF_TRUE;
struct extend_map_element_data *extend_data = data;
struct bt_ctf_private_value *extension_obj_elem_copy = NULL;
goto error;
}
- BT_ASSERT(extension_obj_elem_copy);
+ BT_ASSERT_DBG(extension_obj_elem_copy);
/* Replace in extended object */
extend_data->status = bt_ctf_private_value_map_insert_entry(
goto end;
error:
- BT_ASSERT(extend_data->status != BT_CTF_VALUE_STATUS_OK);
- ret = BT_FALSE;
+ BT_ASSERT_DBG(extend_data->status != BT_CTF_VALUE_STATUS_OK);
+ ret = BT_CTF_FALSE;
end:
BT_CTF_OBJECT_PUT_REF_AND_RESET(extension_obj_elem_copy);
goto error;
}
- BT_ASSERT(extended_map_obj);
+ BT_ASSERT_DBG(extended_map_obj);
/*
* For each key in the extension map object, replace this key
}
BT_HIDDEN
-bt_bool bt_ctf_value_compare(const struct bt_ctf_value *object_a,
+bt_ctf_bool bt_ctf_value_compare(const struct bt_ctf_value *object_a,
const struct bt_ctf_value *object_b)
{
- bt_bool ret = BT_FALSE;
+ bt_ctf_bool ret = BT_CTF_FALSE;
BT_CTF_ASSERT_PRE_NON_NULL(object_a, "Value object A");
BT_CTF_ASSERT_PRE_NON_NULL(object_b, "Value object B");
if (object_a->type != object_b->type) {
- BT_LOGV("Values are different: type mismatch: "
+ BT_LOGT("Values are different: type mismatch: "
"value-a-addr=%p, value-b-addr=%p, "
"value-a-type=%d, value-b-type=%d",
object_a, object_b, object_a->type, object_b->type);
projects / babeltrace.git / blobdiff