X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Ftrace-internal.h;h=30b0ba4f697a62d2c0f6aef05e264f10cb13fe80;hp=eb3e0e27f26f139f4f4c96ac15a24f824b80c190;hb=44c440bc5fe8219cc17d1b786d91fd83c4c9860a;hpb=3230ee6b4f3a704958b761daecae835c56938bc9

diff --git a/include/babeltrace/ctf-ir/trace-internal.h b/include/babeltrace/ctf-ir/trace-internal.h
index eb3e0e27..30b0ba4f 100644
--- a/include/babeltrace/ctf-ir/trace-internal.h
+++ b/include/babeltrace/ctf-ir/trace-internal.h
@@ -27,97 +27,80 @@
  * SOFTWARE.
  */
 
+#include <babeltrace/assert-pre-internal.h>
 #include <babeltrace/ctf-ir/trace.h>
+#include <babeltrace/ctf-ir/stream-class-internal.h>
 #include <babeltrace/ctf-ir/field-types.h>
 #include <babeltrace/ctf-ir/fields.h>
+#include <babeltrace/ctf-ir/attributes-internal.h>
+#include <babeltrace/ctf-ir/clock-class-internal.h>
 #include <babeltrace/object-internal.h>
+#include <babeltrace/object-pool-internal.h>
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/values.h>
+#include <babeltrace/types.h>
 #include <glib.h>
 #include <sys/types.h>
-#include <uuid/uuid.h>
-
-enum field_type_alias {
-	FIELD_TYPE_ALIAS_UINT5_T = 0,
-	FIELD_TYPE_ALIAS_UINT8_T,
-	FIELD_TYPE_ALIAS_UINT16_T,
-	FIELD_TYPE_ALIAS_UINT27_T,
-	FIELD_TYPE_ALIAS_UINT32_T,
-	FIELD_TYPE_ALIAS_UINT64_T,
-	NR_FIELD_TYPE_ALIAS,
-};
+#include <babeltrace/compat/uuid-internal.h>
 
-struct bt_ctf_trace {
+struct bt_trace {
 	struct bt_object base;
-	GString *name;
-	int frozen;
-	uuid_t uuid;
-	enum bt_ctf_byte_order native_byte_order;
+
+	struct {
+		GString *str;
+
+		/* NULL or `str->str` above */
+		const char *value;
+	} name;
+
+	struct {
+		uint8_t uuid[BABELTRACE_UUID_LEN];
+
+		/* NULL or `uuid` above */
+		bt_uuid value;
+	} uuid;
+
 	struct bt_value *environment;
-	GPtrArray *clocks; /* Array of pointers to bt_ctf_clock_class */
-	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;
-	int is_created_by_writer;
+
+	/* Array of `struct bt_stream_class *` */
+	GPtrArray *stream_classes;
+
+	/* Array of `struct bt_stream *` */
+	GPtrArray *streams;
 
 	/*
-	 * This flag indicates if the trace is valid. A valid
-	 * trace is _always_ frozen.
+	 * Stream class (weak) to number of instantiated streams, used
+	 * to automatically assign stream IDs per stream class.
 	 */
-	int valid;
-	GPtrArray *listeners; /* Array of struct listener_wrapper */
-};
+	GHashTable *stream_classes_stream_count;
+
+	struct bt_field_type *packet_header_ft;
+	bool assigns_automatic_stream_class_id;
 
-struct metadata_context {
-	GString *string;
-	GString *field_name;
-	unsigned int current_indentation_level;
+	GArray *is_static_listeners;
+	bool is_static;
+	bool in_remove_listener;
+
+	/* Pool of `struct bt_field_wrapper *` */
+	struct bt_object_pool packet_header_field_pool;
+
+	bool frozen;
 };
 
 BT_HIDDEN
-const char *get_byte_order_string(int byte_order);
+void _bt_trace_freeze(struct bt_trace *trace);
 
-BT_HIDDEN
-struct bt_ctf_field_type *get_field_type(enum field_type_alias alias);
+#ifdef BT_DEV_MODE
+# define bt_trace_freeze		_bt_trace_freeze
+#else
+# define bt_trace_freeze(_trace)
+#endif
 
 BT_HIDDEN
-int bt_ctf_trace_object_modification(struct bt_ctf_object *object,
-		void *trace_ptr);
+void bt_trace_add_stream(struct bt_trace *trace, struct bt_stream *stream);
 
 BT_HIDDEN
-bool bt_ctf_trace_has_clock_class(struct bt_ctf_trace *trace,
-		struct bt_ctf_clock_class *clock_class);
-
-/**
-@brief	User function type to use with bt_ctf_trace_add_listener().
-
-@param[in] obj	New CTF IR object which is part of the trace
-		class hierarchy.
-@param[in] data	User data.
-
-@prenotnull{obj}
-*/
-typedef void (*bt_ctf_listener_cb)(struct bt_ctf_object *obj, void *data);
-
-/**
-@brief	Adds the trace class modification listener \p listener to
-	the CTF IR trace class \p trace_class.
-
-Once you add \p listener to \p trace_class, whenever \p trace_class
-is modified, \p listener is called with the new element and with
-\p data (user data).
-
-@param[in] trace_class	Trace class to which to add \p listener.
-@param[in] listener	Modification listener function.
-@param[in] data		User data.
-@returns		0 on success, or a negative value on error.
-
-@prenotnull{trace_class}
-@prenotnull{listener}
-@postrefcountsame{trace_class}
-*/
-extern int bt_ctf_trace_add_listener(struct bt_ctf_trace *trace_class,
-		bt_ctf_listener_cb listener, void *data);
+uint64_t bt_trace_get_automatic_stream_id(struct bt_trace *trace,
+		struct bt_stream_class *stream_class);
 
 #endif /* BABELTRACE_CTF_IR_TRACE_INTERNAL_H */