lib: trace IR, values: reset pointers to `NULL` on destruction

[babeltrace.git] / lib / trace-ir / fields.c

diff --git a/lib/trace-ir/fields.c b/lib/trace-ir/fields.c
index 9872dd77603da350d8a42b23c89e05ed32949761..8eadc75711f9e902fbe187ae9e90a99dacec7865 100644 (file)
--- a/lib/trace-ir/fields.c
+++ b/lib/trace-ir/fields.c
@@ -1,8 +1,4 @@
 /*
- * fields.c
- *
- * Babeltrace trace IR - Event Fields
- *
  * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
  * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
@@ -30,11 +26,12 @@
 #include <babeltrace/lib-logging-internal.h>
 
 #include <babeltrace/assert-pre-internal.h>
+#include <babeltrace/trace-ir/private-fields.h>
 #include <babeltrace/trace-ir/fields.h>
 #include <babeltrace/trace-ir/fields-internal.h>
 #include <babeltrace/trace-ir/field-classes-internal.h>
 #include <babeltrace/object-internal.h>
-#include <babeltrace/ref.h>
+#include <babeltrace/object.h>
 #include <babeltrace/compiler-internal.h>
 #include <babeltrace/compat/fcntl-internal.h>
 #include <babeltrace/align-internal.h>
@@ -192,6 +189,12 @@ struct bt_field_class *bt_field_borrow_class(struct bt_field *field)
        return field->class;
 }
 
+struct bt_private_field_class *bt_private_field_borrow_class(
+               struct bt_private_field *field)
+{
+       return (void *) bt_field_borrow_class((void *) field);
+}
+
 enum bt_field_class_type bt_field_get_class_type(struct bt_field *field)
 {
        BT_ASSERT_PRE_NON_NULL(field, "Field");
@@ -224,7 +227,7 @@ void init_field(struct bt_field *field, struct bt_field_class *fc,
        BT_ASSERT(fc);
        bt_object_init_unique(&field->base);
        field->methods = methods;
-       field->class = bt_get(fc);
+       field->class = bt_object_get_ref(fc);
 }
 
 static
@@ -282,7 +285,7 @@ struct bt_field *create_string_field(struct bt_field_class *fc)
                sizeof(char), 1);
        if (!string_field->buf) {
                BT_LOGE_STR("Failed to allocate a GArray.");
-               BT_PUT(string_field);
+               BT_OBJECT_PUT_REF_AND_RESET(string_field);
                goto end;
        }
 
@@ -350,7 +353,7 @@ struct bt_field *create_structure_field(struct bt_field_class *fc)
                        &struct_field->fields)) {
                BT_LIB_LOGE("Cannot create structure member fields: "
                        "%![fc-]+F", fc);
-               BT_PUT(struct_field);
+               BT_OBJECT_PUT_REF_AND_RESET(struct_field);
                goto end;
        }
 
@@ -378,7 +381,7 @@ struct bt_field *create_variant_field(struct bt_field_class *fc)
                        &var_field->fields)) {
                BT_LIB_LOGE("Cannot create variant member fields: "
                        "%![fc-]+F", fc);
-               BT_PUT(var_field);
+               BT_OBJECT_PUT_REF_AND_RESET(var_field);
                goto end;
        }
 
@@ -442,7 +445,7 @@ struct bt_field *create_static_array_field(struct bt_field_class *fc)
        if (init_array_field_fields(array_field)) {
                BT_LIB_LOGE("Cannot create static array fields: "
                        "%![fc-]+F", fc);
-               BT_PUT(array_field);
+               BT_OBJECT_PUT_REF_AND_RESET(array_field);
                goto end;
        }
 
@@ -469,7 +472,7 @@ struct bt_field *create_dynamic_array_field(struct bt_field_class *fc)
        if (init_array_field_fields(array_field)) {
                BT_LIB_LOGE("Cannot create dynamic array fields: "
                        "%![fc-]+F", fc);
-               BT_PUT(array_field);
+               BT_OBJECT_PUT_REF_AND_RESET(array_field);
                goto end;
        }
 
@@ -489,8 +492,10 @@ int64_t bt_field_signed_integer_get_value(struct bt_field *field)
        return int_field->value.i;
 }
 
-void bt_field_signed_integer_set_value(struct bt_field *field, int64_t value)
+void bt_private_field_signed_integer_set_value(
+               struct bt_private_field *priv_field, int64_t value)
 {
+       struct bt_field *field = (void *) priv_field;
        struct bt_field_integer *int_field = (void *) field;
 
        BT_ASSERT_PRE_NON_NULL(field, "Field");
@@ -514,9 +519,10 @@ uint64_t bt_field_unsigned_integer_get_value(struct bt_field *field)
        return int_field->value.u;
 }
 
-void bt_field_unsigned_integer_set_value(struct bt_field *field,
-               uint64_t value)
+void bt_private_field_unsigned_integer_set_value(
+               struct bt_private_field *priv_field, uint64_t value)
 {
+       struct bt_field *field = (void *) priv_field;
        struct bt_field_integer *int_field = (void *) field;
 
        BT_ASSERT_PRE_NON_NULL(field, "Field");
@@ -540,8 +546,10 @@ double bt_field_real_get_value(struct bt_field *field)
        return real_field->value;
 }
 
-void bt_field_real_set_value(struct bt_field *field, double value)
+void bt_private_field_real_set_value(struct bt_private_field *priv_field,
+               double value)
 {
+       struct bt_field *field = (void *) priv_field;
        struct bt_field_real *real_field = (void *) field;
 
        BT_ASSERT_PRE_NON_NULL(field, "Field");
@@ -610,27 +618,33 @@ uint64_t bt_field_string_get_length(struct bt_field *field)
        return string_field->length;
 }
 
-int bt_field_string_set_value(struct bt_field *field, const char *value)
+int bt_private_field_string_set_value(struct bt_private_field *priv_field,
+               const char *value)
 {
+       struct bt_field *field = (void *) priv_field;
+
        BT_ASSERT_PRE_NON_NULL(field, "Field");
        BT_ASSERT_PRE_NON_NULL(value, "Value");
        BT_ASSERT_PRE_FIELD_HOT(field, "Field");
        BT_ASSERT_PRE_FIELD_HAS_CLASS_TYPE(field, BT_FIELD_CLASS_TYPE_STRING,
                "Field");
-       bt_field_string_clear(field);
-       return bt_field_string_append_with_length(field, value,
+       bt_private_field_string_clear(priv_field);
+       return bt_private_field_string_append_with_length(priv_field, value,
                (uint64_t) strlen(value));
 }
 
-int bt_field_string_append(struct bt_field *field, const char *value)
+int bt_private_field_string_append(struct bt_private_field *field,
+               const char *value)
 {
-       return bt_field_string_append_with_length(field, value,
-               (uint64_t) strlen(value));
+       return bt_private_field_string_append_with_length(field,
+               value, (uint64_t) strlen(value));
 }
 
-int bt_field_string_append_with_length(struct bt_field *field,
+int bt_private_field_string_append_with_length(
+               struct bt_private_field *priv_field,
                const char *value, uint64_t length)
 {
+       struct bt_field *field = (void *) priv_field;
        struct bt_field_string *string_field = (void *) field;
        char *data;
        uint64_t new_length;
@@ -660,8 +674,9 @@ int bt_field_string_append_with_length(struct bt_field *field,
        return 0;
 }
 
-int bt_field_string_clear(struct bt_field *field)
+int bt_private_field_string_clear(struct bt_private_field *priv_field)
 {
+       struct bt_field *field = (void *) priv_field;
        struct bt_field_string *string_field = (void *) field;
 
        BT_ASSERT_PRE_NON_NULL(field, "Field");
@@ -682,10 +697,11 @@ uint64_t bt_field_array_get_length(struct bt_field *field)
        return array_field->length;
 }
 
-int bt_field_dynamic_array_set_length(struct bt_field *field,
-               uint64_t length)
+int bt_private_field_dynamic_array_set_length(
+               struct bt_private_field *priv_field, uint64_t length)
 {
        int ret = 0;
+       struct bt_field *field = (void *) priv_field;
        struct bt_field_array *array_field = (void *) field;
 
        BT_ASSERT_PRE_NON_NULL(field, "Field");
@@ -737,6 +753,14 @@ struct bt_field *bt_field_array_borrow_element_field_by_index(
        return array_field->fields->pdata[index];
 }
 
+struct bt_private_field *
+bt_private_field_array_borrow_element_field_by_index(
+               struct bt_private_field *field, uint64_t index)
+{
+       return (void *) bt_field_array_borrow_element_field_by_index(
+               (void *) field, index);
+}
+
 struct bt_field *bt_field_structure_borrow_member_field_by_index(
                struct bt_field *field, uint64_t index)
 {
@@ -749,6 +773,14 @@ struct bt_field *bt_field_structure_borrow_member_field_by_index(
        return struct_field->fields->pdata[index];
 }
 
+struct bt_private_field *
+bt_private_field_structure_borrow_member_field_by_index(
+               struct bt_private_field *field, uint64_t index)
+{
+       return (void *) bt_field_structure_borrow_member_field_by_index(
+               (void *) field, index);
+}
+
 struct bt_field *bt_field_structure_borrow_member_field_by_name(
                struct bt_field *field, const char *name)
 {
@@ -776,6 +808,14 @@ end:
        return ret_field;
 }
 
+struct bt_private_field *
+bt_private_field_structure_borrow_member_field_by_name(
+               struct bt_private_field *field, const char *name)
+{
+       return (void *) bt_field_structure_borrow_member_field_by_name(
+               (void *) field, name);
+}
+
 struct bt_field *bt_field_variant_borrow_selected_option_field(
                struct bt_field *field)
 {
@@ -789,9 +829,18 @@ struct bt_field *bt_field_variant_borrow_selected_option_field(
        return var_field->selected_field;
 }
 
-int bt_field_variant_select_option_field(struct bt_field *field,
-               uint64_t index)
+struct bt_private_field *
+bt_private_field_variant_borrow_selected_option_field(
+               struct bt_private_field *field)
+{
+       return (void *) bt_field_variant_borrow_selected_option_field(
+               (void *) field);
+}
+
+int bt_private_field_variant_select_option_field(
+               struct bt_private_field *priv_field, uint64_t index)
 {
+       struct bt_field *field = (void *) priv_field;
        struct bt_field_variant *var_field = (void *) field;
 
        BT_ASSERT_PRE_NON_NULL(field, "Field");
@@ -822,7 +871,7 @@ void bt_field_finalize(struct bt_field *field)
 {
        BT_ASSERT(field);
        BT_LOGD_STR("Putting field's class.");
-       bt_put(field->class);
+       BT_OBJECT_PUT_REF_AND_RESET(field->class);
 }
 
 static
@@ -854,6 +903,7 @@ void destroy_structure_field(struct bt_field *field)
 
        if (struct_field->fields) {
                g_ptr_array_free(struct_field->fields, TRUE);
+               struct_field->fields = NULL;
        }
 
        g_free(field);
@@ -870,6 +920,7 @@ void destroy_variant_field(struct bt_field *field)
 
        if (var_field->fields) {
                g_ptr_array_free(var_field->fields, TRUE);
+               var_field->fields = NULL;
        }
 
        g_free(field);
@@ -886,6 +937,7 @@ void destroy_array_field(struct bt_field *field)
 
        if (array_field->fields) {
                g_ptr_array_free(array_field->fields, TRUE);
+               array_field->fields = NULL;
        }
 
        g_free(field);
@@ -902,6 +954,7 @@ void destroy_string_field(struct bt_field *field)
 
        if (string_field->buf) {
                g_array_free(string_field->buf, TRUE);
+               string_field->buf = NULL;
        }
 
        g_free(field);