Unify reference counting using a common bt_object base

[babeltrace.git] / include / babeltrace / ctf-ir / trace-internal.h

diff --git a/include/babeltrace/ctf-ir/trace-internal.h b/include/babeltrace/ctf-ir/trace-internal.h
index 169b76bf5d90e03ee11686a86af562d56a2fb58b..227120dc86817097b8a84ecba2e507d34ca2ec8f 100644 (file)
--- a/include/babeltrace/ctf-ir/trace-internal.h
+++ b/include/babeltrace/ctf-ir/trace-internal.h
@@ -27,11 +27,12 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/ctf-writer/ref-internal.h>
 #include <babeltrace/ctf-ir/trace.h>
 #include <babeltrace/ctf-ir/event-types.h>
 #include <babeltrace/ctf-ir/event-fields.h>
+#include <babeltrace/object-internal.h>
 #include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/values.h>
 #include <glib.h>
 #include <sys/types.h>
 #include <uuid/uuid.h>
@@ -47,33 +48,24 @@ enum field_type_alias {
 };
 
 struct bt_ctf_trace {
-       struct bt_ctf_ref ref_count;
+       struct bt_object base;
        int frozen;
        uuid_t uuid;
-       int byte_order;
-       GPtrArray *environment; /* Array of pointers to environment_variable */
+       int byte_order; /* A value defined in Babeltrace's "endian.h" */
+       struct bt_value *environment;
        GPtrArray *clocks; /* Array of pointers to bt_ctf_clock */
        GPtrArray *stream_classes; /* Array of ptrs to bt_ctf_stream_class */
        GPtrArray *streams; /* Array of ptrs to bt_ctf_stream */
-       struct bt_ctf_field_type *trace_packet_header_type;
-       struct bt_ctf_field *trace_packet_header;
+       struct bt_ctf_field_type *packet_header_type;
        uint64_t next_stream_id;
 };
 
-struct environment_variable {
-       GString *name, *value;
-};
-
 struct metadata_context {
        GString *string;
        GString *field_name;
        unsigned int current_indentation_level;
 };
 
-/* Checks that the string does not contain a reserved keyword */
-BT_HIDDEN
-int validate_identifier(const char *string);
-
 BT_HIDDEN
 const char *get_byte_order_string(int byte_order);