#include <babeltrace/compiler-internal.h>
#include <babeltrace/common-internal.h>
#include <babeltrace/object.h>
+#include <babeltrace/values-const.h>
#include <babeltrace/values.h>
-#include <babeltrace/private-values.h>
#include <babeltrace/compat/glib-internal.h>
#include <babeltrace/types.h>
#include <babeltrace/object-internal.h>
};
struct bt_value *bt_value_null = &bt_value_null_instance;
-struct bt_private_value *bt_private_value_null =
- (void *) &bt_value_null_instance;
struct bt_value_bool {
struct bt_value base;
};
static
-struct bt_private_value *bt_value_null_copy(const struct bt_value *null_obj)
+struct bt_value *bt_value_null_copy(const struct bt_value *null_obj)
{
return (void *) bt_value_null;
}
static
-struct bt_private_value *bt_value_bool_copy(const struct bt_value *bool_obj)
+struct bt_value *bt_value_bool_copy(const struct bt_value *bool_obj)
{
- return bt_private_value_bool_create_init(
+ return bt_value_bool_create_init(
BT_VALUE_TO_BOOL(bool_obj)->value);
}
static
-struct bt_private_value *bt_value_integer_copy(
+struct bt_value *bt_value_integer_copy(
const struct bt_value *integer_obj)
{
- return bt_private_value_integer_create_init(
+ return bt_value_integer_create_init(
BT_VALUE_TO_INTEGER(integer_obj)->value);
}
static
-struct bt_private_value *bt_value_real_copy(const struct bt_value *real_obj)
+struct bt_value *bt_value_real_copy(const struct bt_value *real_obj)
{
- return bt_private_value_real_create_init(
+ return bt_value_real_create_init(
BT_VALUE_TO_REAL(real_obj)->value);
}
static
-struct bt_private_value *bt_value_string_copy(const struct bt_value *string_obj)
+struct bt_value *bt_value_string_copy(const struct bt_value *string_obj)
{
- return bt_private_value_string_create_init(
+ return bt_value_string_create_init(
BT_VALUE_TO_STRING(string_obj)->gstr->str);
}
static
-struct bt_private_value *bt_value_array_copy(const struct bt_value *array_obj)
+struct bt_value *bt_value_array_copy(const struct bt_value *array_obj)
{
int i;
int ret;
- struct bt_private_value *copy_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_private_value_array_create();
+ copy_obj = bt_value_array_create();
if (!copy_obj) {
BT_LOGE_STR("Cannot create empty array value.");
goto end;
}
for (i = 0; i < typed_array_obj->garray->len; ++i) {
- struct bt_private_value *element_obj_copy = NULL;
- struct bt_value *element_obj =
- bt_value_array_borrow_element_by_index(
+ struct bt_value *element_obj_copy = NULL;
+ const struct bt_value *element_obj =
+ bt_value_array_borrow_element_by_index_const(
array_obj, i);
BT_ASSERT(element_obj);
}
BT_ASSERT(element_obj_copy);
- ret = bt_private_value_array_append_element(copy_obj,
+ ret = bt_value_array_append_element(copy_obj,
(void *) element_obj_copy);
BT_OBJECT_PUT_REF_AND_RESET(element_obj_copy);
if (ret) {
}
static
-struct bt_private_value *bt_value_map_copy(const struct bt_value *map_obj)
+struct bt_value *bt_value_map_copy(const struct bt_value *map_obj)
{
int ret;
GHashTableIter iter;
gpointer key, element_obj;
- struct bt_private_value *copy_obj;
- struct bt_private_value *element_obj_copy = NULL;
+ struct bt_value *copy_obj;
+ struct bt_value *element_obj_copy = NULL;
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_private_value_map_create();
+ copy_obj = bt_value_map_create();
if (!copy_obj) {
goto end;
}
}
BT_ASSERT(element_obj_copy);
- ret = bt_private_value_map_insert_entry(copy_obj, key_str,
+ ret = bt_value_map_insert_entry(copy_obj, key_str,
(void *) element_obj_copy);
BT_OBJECT_PUT_REF_AND_RESET(element_obj_copy);
if (ret) {
}
static
-struct bt_private_value *(* const copy_funcs[])(const struct bt_value *) = {
+struct bt_value *(* const copy_funcs[])(const struct bt_value *) = {
[BT_VALUE_TYPE_NULL] = bt_value_null_copy,
[BT_VALUE_TYPE_BOOL] = bt_value_bool_copy,
[BT_VALUE_TYPE_INTEGER] = bt_value_integer_copy,
}
for (i = 0; i < array_obj_a->garray->len; ++i) {
- struct bt_value *element_obj_a;
- struct bt_value *element_obj_b;
+ const struct bt_value *element_obj_a;
+ const struct bt_value *element_obj_b;
- element_obj_a = bt_value_array_borrow_element_by_index(
+ element_obj_a = bt_value_array_borrow_element_by_index_const(
object_a, i);
- element_obj_b = bt_value_array_borrow_element_by_index(
+ element_obj_b = bt_value_array_borrow_element_by_index_const(
object_b, i);
if (!bt_value_compare(element_obj_a, element_obj_b)) {
g_hash_table_iter_init(&iter, map_obj_a->ght);
while (g_hash_table_iter_next(&iter, &key, &element_obj_a)) {
- struct bt_value *element_obj_b;
+ const struct bt_value *element_obj_b;
const char *key_str = g_quark_to_string(GPOINTER_TO_UINT(key));
- element_obj_b = bt_value_map_borrow_entry_value(object_b,
+ element_obj_b = bt_value_map_borrow_entry_value_const(object_b,
key_str);
if (!bt_value_compare(element_obj_a, element_obj_b)) {
}
BT_HIDDEN
-enum bt_value_status _bt_value_freeze(struct bt_value *object)
+enum bt_value_status _bt_value_freeze(const struct bt_value *c_object)
{
+ const struct bt_value *object = (void *) c_object;
enum bt_value_status ret = BT_VALUE_STATUS_OK;
BT_ASSERT(object);
}
BT_LOGD("Freezing value: addr=%p", object);
- freeze_funcs[object->type](object);
+ freeze_funcs[object->type]((void *) object);
end:
return ret;
return value;
}
-struct bt_private_value *bt_private_value_bool_create_init(bt_bool val)
+struct bt_value *bt_value_bool_create_init(bt_bool val)
{
struct bt_value_bool *bool_obj;
return (void *) BT_VALUE_FROM_CONCRETE(bool_obj);
}
-struct bt_private_value *bt_private_value_bool_create(void)
+struct bt_value *bt_value_bool_create(void)
{
- return bt_private_value_bool_create_init(BT_FALSE);
+ return bt_value_bool_create_init(BT_FALSE);
}
-struct bt_private_value *bt_private_value_integer_create_init(int64_t val)
+struct bt_value *bt_value_integer_create_init(int64_t val)
{
struct bt_value_integer *integer_obj;
return (void *) BT_VALUE_FROM_CONCRETE(integer_obj);
}
-struct bt_private_value *bt_private_value_integer_create(void)
+struct bt_value *bt_value_integer_create(void)
{
- return bt_private_value_integer_create_init(0);
+ return bt_value_integer_create_init(0);
}
-struct bt_private_value *bt_private_value_real_create_init(double val)
+struct bt_value *bt_value_real_create_init(double val)
{
struct bt_value_real *real_obj;
return (void *) BT_VALUE_FROM_CONCRETE(real_obj);
}
-struct bt_private_value *bt_private_value_real_create(void)
+struct bt_value *bt_value_real_create(void)
{
- return bt_private_value_real_create_init(0.);
+ return bt_value_real_create_init(0.);
}
-struct bt_private_value *bt_private_value_string_create_init(const char *val)
+struct bt_value *bt_value_string_create_init(const char *val)
{
struct bt_value_string *string_obj = NULL;
return (void *) BT_VALUE_FROM_CONCRETE(string_obj);
}
-struct bt_private_value *bt_private_value_string_create(void)
+struct bt_value *bt_value_string_create(void)
{
- return bt_private_value_string_create_init("");
+ return bt_value_string_create_init("");
}
-struct bt_private_value *bt_private_value_array_create(void)
+struct bt_value *bt_value_array_create(void)
{
struct bt_value_array *array_obj;
return (void *) BT_VALUE_FROM_CONCRETE(array_obj);
}
-struct bt_private_value *bt_private_value_map_create(void)
+struct bt_value *bt_value_map_create(void)
{
struct bt_value_map *map_obj;
return BT_VALUE_TO_BOOL(bool_obj)->value;
}
-void bt_private_value_bool_set(struct bt_private_value *bool_obj, bt_bool val)
+void bt_value_bool_set(struct bt_value *bool_obj, bt_bool val)
{
BT_ASSERT_PRE_NON_NULL(bool_obj, "Value object");
BT_ASSERT_PRE_VALUE_IS_TYPE(bool_obj, BT_VALUE_TYPE_BOOL);
return BT_VALUE_TO_INTEGER(integer_obj)->value;
}
-void bt_private_value_integer_set(struct bt_private_value *integer_obj,
+void bt_value_integer_set(struct bt_value *integer_obj,
int64_t val)
{
BT_ASSERT_PRE_NON_NULL(integer_obj, "Value object");
return BT_VALUE_TO_REAL(real_obj)->value;
}
-void bt_private_value_real_set(struct bt_private_value *real_obj, double val)
+void bt_value_real_set(struct bt_value *real_obj, double val)
{
BT_ASSERT_PRE_NON_NULL(real_obj, "Value object");
BT_ASSERT_PRE_VALUE_IS_TYPE(real_obj, BT_VALUE_TYPE_REAL);
return BT_VALUE_TO_STRING(string_obj)->gstr->str;
}
-enum bt_value_status bt_private_value_string_set(
- struct bt_private_value *string_obj, const char *val)
+enum bt_value_status bt_value_string_set(
+ struct bt_value *string_obj, const char *val)
{
BT_ASSERT_PRE_NON_NULL(string_obj, "Value object");
BT_ASSERT_PRE_VALUE_IS_TYPE(string_obj, BT_VALUE_TYPE_STRING);
}
struct bt_value *bt_value_array_borrow_element_by_index(
- const struct bt_value *array_obj,
- uint64_t index)
+ struct bt_value *array_obj, uint64_t index)
{
struct bt_value_array *typed_array_obj =
BT_VALUE_TO_ARRAY(array_obj);
return g_ptr_array_index(typed_array_obj->garray, index);
}
-struct bt_private_value *bt_private_value_array_borrow_element_by_index(
- const struct bt_private_value *array_obj,
+const struct bt_value *bt_value_array_borrow_element_by_index_const(
+ const struct bt_value *array_obj,
uint64_t index)
{
- return (void *) bt_value_array_borrow_element_by_index(
+ return bt_value_array_borrow_element_by_index(
(void *) array_obj, index);
}
-enum bt_value_status bt_private_value_array_append_element(
- struct bt_private_value *array_obj,
+enum bt_value_status bt_value_array_append_element(
+ struct bt_value *array_obj,
struct bt_value *element_obj)
{
struct bt_value_array *typed_array_obj =
return BT_VALUE_STATUS_OK;
}
-enum bt_value_status bt_private_value_array_append_bool_element(
- struct bt_private_value *array_obj, bt_bool val)
+enum bt_value_status bt_value_array_append_bool_element(
+ struct bt_value *array_obj, bt_bool val)
{
enum bt_value_status ret;
- struct bt_private_value *bool_obj = NULL;
+ struct bt_value *bool_obj = NULL;
- bool_obj = bt_private_value_bool_create_init(val);
- ret = bt_private_value_array_append_element(array_obj,
+ bool_obj = bt_value_bool_create_init(val);
+ ret = bt_value_array_append_element(array_obj,
(void *) bool_obj);
bt_object_put_ref(bool_obj);
return ret;
}
-enum bt_value_status bt_private_value_array_append_integer_element(
- struct bt_private_value *array_obj, int64_t val)
+enum bt_value_status bt_value_array_append_integer_element(
+ struct bt_value *array_obj, int64_t val)
{
enum bt_value_status ret;
- struct bt_private_value *integer_obj = NULL;
+ struct bt_value *integer_obj = NULL;
- integer_obj = bt_private_value_integer_create_init(val);
- ret = bt_private_value_array_append_element(array_obj,
+ integer_obj = bt_value_integer_create_init(val);
+ ret = bt_value_array_append_element(array_obj,
(void *) integer_obj);
bt_object_put_ref(integer_obj);
return ret;
}
-enum bt_value_status bt_private_value_array_append_real_element(
- struct bt_private_value *array_obj, double val)
+enum bt_value_status bt_value_array_append_real_element(
+ struct bt_value *array_obj, double val)
{
enum bt_value_status ret;
- struct bt_private_value *real_obj = NULL;
+ struct bt_value *real_obj = NULL;
- real_obj = bt_private_value_real_create_init(val);
- ret = bt_private_value_array_append_element(array_obj,
+ real_obj = bt_value_real_create_init(val);
+ ret = bt_value_array_append_element(array_obj,
(void *) real_obj);
bt_object_put_ref(real_obj);
return ret;
}
-enum bt_value_status bt_private_value_array_append_string_element(
- struct bt_private_value *array_obj, const char *val)
+enum bt_value_status bt_value_array_append_string_element(
+ struct bt_value *array_obj, const char *val)
{
enum bt_value_status ret;
- struct bt_private_value *string_obj = NULL;
+ struct bt_value *string_obj = NULL;
- string_obj = bt_private_value_string_create_init(val);
- ret = bt_private_value_array_append_element(array_obj,
+ string_obj = bt_value_string_create_init(val);
+ ret = bt_value_array_append_element(array_obj,
(void *) string_obj);
bt_object_put_ref(string_obj);
return ret;
}
-enum bt_value_status bt_private_value_array_append_empty_array_element(
- struct bt_private_value *array_obj)
+enum bt_value_status bt_value_array_append_empty_array_element(
+ struct bt_value *array_obj)
{
enum bt_value_status ret;
- struct bt_private_value *empty_array_obj = NULL;
+ struct bt_value *empty_array_obj = NULL;
- empty_array_obj = bt_private_value_array_create();
- ret = bt_private_value_array_append_element(array_obj,
+ empty_array_obj = bt_value_array_create();
+ ret = bt_value_array_append_element(array_obj,
(void *) empty_array_obj);
bt_object_put_ref(empty_array_obj);
return ret;
}
-enum bt_value_status bt_private_value_array_append_empty_map_element(
- struct bt_private_value *array_obj)
+enum bt_value_status bt_value_array_append_empty_map_element(
+ struct bt_value *array_obj)
{
enum bt_value_status ret;
- struct bt_private_value *map_obj = NULL;
+ struct bt_value *map_obj = NULL;
- map_obj = bt_private_value_map_create();
- ret = bt_private_value_array_append_element(array_obj,
+ map_obj = bt_value_map_create();
+ ret = bt_value_array_append_element(array_obj,
(void *) map_obj);
bt_object_put_ref(map_obj);
return ret;
}
-enum bt_value_status bt_private_value_array_set_element_by_index(
- struct bt_private_value *array_obj, uint64_t index,
+enum bt_value_status bt_value_array_set_element_by_index(
+ struct bt_value *array_obj, uint64_t index,
struct bt_value *element_obj)
{
struct bt_value_array *typed_array_obj =
return (uint64_t) g_hash_table_size(BT_VALUE_TO_MAP(map_obj)->ght);
}
-struct bt_value *bt_value_map_borrow_entry_value(const struct bt_value *map_obj,
+struct bt_value *bt_value_map_borrow_entry_value(struct bt_value *map_obj,
const char *key)
{
BT_ASSERT_PRE_NON_NULL(map_obj, "Value object");
GUINT_TO_POINTER(g_quark_from_string(key)));
}
-struct bt_private_value *bt_private_value_map_borrow_entry_value(
- const struct bt_private_value *map_obj, const char *key)
+const struct bt_value *bt_value_map_borrow_entry_value_const(
+ const struct bt_value *map_obj, const char *key)
{
- return (void *) bt_value_map_borrow_entry_value((void *) map_obj, key);
+ return bt_value_map_borrow_entry_value((void *) map_obj, key);
}
bt_bool bt_value_map_has_entry(const struct bt_value *map_obj, const char *key)
GUINT_TO_POINTER(g_quark_from_string(key)));
}
-enum bt_value_status bt_private_value_map_insert_entry(
- struct bt_private_value *map_obj,
+enum bt_value_status bt_value_map_insert_entry(
+ struct bt_value *map_obj,
const char *key, struct bt_value *element_obj)
{
BT_ASSERT_PRE_NON_NULL(map_obj, "Map value object");
return BT_VALUE_STATUS_OK;
}
-enum bt_value_status bt_private_value_map_insert_bool_entry(
- struct bt_private_value *map_obj, const char *key, bt_bool val)
+enum bt_value_status bt_value_map_insert_bool_entry(
+ struct bt_value *map_obj, const char *key, bt_bool val)
{
enum bt_value_status ret;
- struct bt_private_value *bool_obj = NULL;
+ struct bt_value *bool_obj = NULL;
- bool_obj = bt_private_value_bool_create_init(val);
- ret = bt_private_value_map_insert_entry(map_obj, key,
+ bool_obj = bt_value_bool_create_init(val);
+ ret = bt_value_map_insert_entry(map_obj, key,
(void *) bool_obj);
bt_object_put_ref(bool_obj);
return ret;
}
-enum bt_value_status bt_private_value_map_insert_integer_entry(
- struct bt_private_value *map_obj, const char *key, int64_t val)
+enum bt_value_status bt_value_map_insert_integer_entry(
+ struct bt_value *map_obj, const char *key, int64_t val)
{
enum bt_value_status ret;
- struct bt_private_value *integer_obj = NULL;
+ struct bt_value *integer_obj = NULL;
- integer_obj = bt_private_value_integer_create_init(val);
- ret = bt_private_value_map_insert_entry(map_obj, key,
+ integer_obj = bt_value_integer_create_init(val);
+ ret = bt_value_map_insert_entry(map_obj, key,
(void *) integer_obj);
bt_object_put_ref(integer_obj);
return ret;
}
-enum bt_value_status bt_private_value_map_insert_real_entry(
- struct bt_private_value *map_obj, const char *key, double val)
+enum bt_value_status bt_value_map_insert_real_entry(
+ struct bt_value *map_obj, const char *key, double val)
{
enum bt_value_status ret;
- struct bt_private_value *real_obj = NULL;
+ struct bt_value *real_obj = NULL;
- real_obj = bt_private_value_real_create_init(val);
- ret = bt_private_value_map_insert_entry(map_obj, key,
+ real_obj = bt_value_real_create_init(val);
+ ret = bt_value_map_insert_entry(map_obj, key,
(void *) real_obj);
bt_object_put_ref(real_obj);
return ret;
}
-enum bt_value_status bt_private_value_map_insert_string_entry(
- struct bt_private_value *map_obj, const char *key,
+enum bt_value_status bt_value_map_insert_string_entry(
+ struct bt_value *map_obj, const char *key,
const char *val)
{
enum bt_value_status ret;
- struct bt_private_value *string_obj = NULL;
+ struct bt_value *string_obj = NULL;
- string_obj = bt_private_value_string_create_init(val);
- ret = bt_private_value_map_insert_entry(map_obj, key,
+ string_obj = bt_value_string_create_init(val);
+ ret = bt_value_map_insert_entry(map_obj, key,
(void *) string_obj);
bt_object_put_ref(string_obj);
return ret;
}
-enum bt_value_status bt_private_value_map_insert_empty_array_entry(
- struct bt_private_value *map_obj, const char *key)
+enum bt_value_status bt_value_map_insert_empty_array_entry(
+ struct bt_value *map_obj, const char *key)
{
enum bt_value_status ret;
- struct bt_private_value *array_obj = NULL;
+ struct bt_value *array_obj = NULL;
- array_obj = bt_private_value_array_create();
- ret = bt_private_value_map_insert_entry(map_obj, key,
+ array_obj = bt_value_array_create();
+ ret = bt_value_map_insert_entry(map_obj, key,
(void *) array_obj);
bt_object_put_ref(array_obj);
return ret;
}
-enum bt_value_status bt_private_value_map_insert_empty_map_entry(
- struct bt_private_value *map_obj, const char *key)
+enum bt_value_status bt_value_map_insert_empty_map_entry(
+ struct bt_value *map_obj, const char *key)
{
enum bt_value_status ret;
- struct bt_private_value *empty_map_obj = NULL;
+ struct bt_value *empty_map_obj = NULL;
- empty_map_obj = bt_private_value_map_create();
- ret = bt_private_value_map_insert_entry(map_obj, key,
+ empty_map_obj = bt_value_map_create();
+ ret = bt_value_map_insert_entry(map_obj, key,
(void *) empty_map_obj);
bt_object_put_ref(empty_map_obj);
return ret;
}
-enum bt_value_status bt_value_map_foreach_entry(const struct bt_value *map_obj,
+enum bt_value_status bt_value_map_foreach_entry(struct bt_value *map_obj,
bt_value_map_foreach_entry_cb cb, void *data)
{
enum bt_value_status ret = BT_VALUE_STATUS_OK;
return ret;
}
-enum bt_value_status bt_private_value_map_foreach_entry(
- const struct bt_private_value *map_obj,
- bt_private_value_map_foreach_entry_cb cb, void *data)
+enum bt_value_status bt_value_map_foreach_entry_const(
+ const struct bt_value *map_obj,
+ bt_value_map_foreach_entry_const_cb cb, void *data)
{
return bt_value_map_foreach_entry((void *) map_obj,
(bt_value_map_foreach_entry_cb) cb, data);
}
struct extend_map_element_data {
- struct bt_private_value *extended_obj;
+ struct bt_value *extended_obj;
enum bt_value_status status;
};
static
bt_bool extend_map_element(const char *key,
- struct bt_value *extension_obj_elem, void *data)
+ const struct bt_value *extension_obj_elem, void *data)
{
bt_bool ret = BT_TRUE;
struct extend_map_element_data *extend_data = data;
- struct bt_private_value *extension_obj_elem_copy = NULL;
+ struct bt_value *extension_obj_elem_copy = NULL;
/* Copy object which is to replace the current one */
extend_data->status = bt_value_copy(&extension_obj_elem_copy,
BT_ASSERT(extension_obj_elem_copy);
/* Replace in extended object */
- extend_data->status = bt_private_value_map_insert_entry(
+ extend_data->status = bt_value_map_insert_entry(
extend_data->extended_obj, key,
(void *) extension_obj_elem_copy);
if (extend_data->status) {
}
enum bt_value_status bt_value_map_extend(
- struct bt_private_value **extended_map_obj,
+ struct bt_value **extended_map_obj,
const struct bt_value *base_map_obj,
const struct bt_value *extension_obj)
{
*/
extend_data.extended_obj = *extended_map_obj;
- if (bt_value_map_foreach_entry(extension_obj, extend_map_element,
+ if (bt_value_map_foreach_entry_const(extension_obj, extend_map_element,
&extend_data)) {
BT_LOGE("Cannot iterate on the extension object's elements: "
"extension-value-addr=%p", extension_obj);
return extend_data.status;
}
-enum bt_value_status bt_value_copy(struct bt_private_value **copy_obj,
+enum bt_value_status bt_value_copy(struct bt_value **copy_obj,
const struct bt_value *object)
{
enum bt_value_status status = BT_VALUE_STATUS_OK;
projects / babeltrace.git / blobdiff