X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Ftrace-internal.h;h=e92eb7c1ade9f084a1d1ae2cee9ee477ce3661e2;hb=09840de5d022697671dafe2bed427fa5c09b40b9;hp=dc0b7069e196f39457049ac66031eea703f411dd;hpb=d246b1115dbace6a7d67828cfd3fb1d5dc1c4f58;p=babeltrace.git

diff --git a/include/babeltrace/ctf-ir/trace-internal.h b/include/babeltrace/ctf-ir/trace-internal.h
index dc0b7069..e92eb7c1 100644
--- 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,20 +48,22 @@ 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 *packet_header_type;
 	uint64_t next_stream_id;
-};
 
-struct environment_variable {
-	GString *name, *value;
+	/*
+	 * This flag indicates if the trace is valid. A valid
+	 * trace is _always_ frozen.
+	 */
+	int valid;
 };
 
 struct metadata_context {
@@ -69,10 +72,6 @@ struct metadata_context {
 	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);