debug-info filter plugin

[babeltrace.git] / lib / values.c

diff --git a/lib/values.c b/lib/values.c
index 5e7f55c612aaabe6455253ac9b4ba9c641410be4..1c7902bd73ea10b6c688841ad7dd08f635f20dde 100644 (file)
--- a/lib/values.c
+++ b/lib/values.c
@@ -51,6 +51,14 @@ struct bt_value {
 
 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,
 };
@@ -226,7 +234,7 @@ 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);
 
@@ -357,7 +365,7 @@ 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);
 
@@ -606,7 +614,7 @@ struct bt_value *bt_value_array_create(void)
        }
 
        array_obj->base = bt_value_create_base(BT_VALUE_TYPE_ARRAY);
-       array_obj->garray = babeltrace_g_ptr_array_new_full(0,
+       array_obj->garray = bt_g_ptr_array_new_full(0,
                (GDestroyNotify) bt_put);
 
        if (!array_obj->garray) {
@@ -1029,7 +1037,7 @@ bool bt_value_map_has_key(const struct bt_value *map_obj, const char *key)
        }
 
        quark = g_quark_from_string(key);
-       ret = babeltrace_g_hash_table_contains(typed_map_obj->ght,
+       ret = bt_g_hash_table_contains(typed_map_obj->ght,
                GUINT_TO_POINTER(quark));
 
 end:
@@ -1156,7 +1164,7 @@ 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)) {
                        ret = BT_VALUE_STATUS_CANCELLED;
@@ -1168,6 +1176,81 @@ end:
        return ret;
 }
 
+struct extend_map_element_data {
+       struct bt_value *extended_obj;
+       bool got_error;
+};
+
+static
+bool extend_map_element(const char *key,
+               struct bt_value *extension_obj_elem, void *data)
+{
+       bool ret = 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)) {
+               goto error;
+       }
+
+       goto end;
+
+error:
+       ret = false;
+       extend_data->got_error = 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 (!bt_value_is_map(base_map_obj) || !bt_value_is_map(extension_obj)) {
+               goto error;
+       }
+
+       /* Create copy of base map object to start with */
+       extended_obj = bt_value_copy(base_map_obj);
+       if (!extended_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)) {
+               goto error;
+       }
+
+       if (extend_data.got_error) {
+               goto error;
+       }
+
+       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;