X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fstream-class-internal.h;h=844a0c713de80550330b06ad6358e0d0cfa5b1fb;hb=7b33a0e0d8f23d90285ea7c7820a725bcbd96c6b;hp=3bde4ed9c132dd5944cdae5fb1ea71b00fb05bfe;hpb=839d52a5c5c1fdd66cee9bf7d06c0c0acdd4c2a3;p=babeltrace.git

diff --git a/include/babeltrace/ctf-ir/stream-class-internal.h b/include/babeltrace/ctf-ir/stream-class-internal.h
index 3bde4ed9..844a0c71 100644
--- a/include/babeltrace/ctf-ir/stream-class-internal.h
+++ b/include/babeltrace/ctf-ir/stream-class-internal.h
@@ -27,72 +27,66 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/ctf-writer/clock.h>
-#include <babeltrace/ctf-writer/event-fields.h>
-#include <babeltrace/ctf-writer/event-types.h>
-#include <babeltrace/ctf-ir/trace.h>
+#include <babeltrace/assert-internal.h>
+#include <babeltrace/common-internal.h>
+#include <babeltrace/ctf-ir/field-types-internal.h>
+#include <babeltrace/ctf-ir/utils-internal.h>
+#include <babeltrace/ctf-ir/stream-class.h>
 #include <babeltrace/object-internal.h>
+#include <babeltrace/object-pool-internal.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/ctf-ir/trace-internal.h>
-#include <assert.h>
 #include <glib.h>
+#include <inttypes.h>
 
 struct bt_stream_class {
 	struct bt_object base;
-	GString *name;
-	struct bt_ctf_clock *clock;
-	GPtrArray *event_classes; /* Array of pointers to bt_event_class */
-	/* event class id (int64_t) to event class */
-	GHashTable *event_classes_ht;
-	int id_set;
-	int64_t id;
-	int64_t next_event_id;
-	int64_t next_stream_id;
-	struct bt_field_type *packet_context_type;
-	struct bt_field_type *event_header_type;
-	struct bt_field_type *event_context_type;
-	int frozen;
-	int byte_order;
 
-	/*
-	 * This flag indicates if the stream class is valid. A valid
-	 * stream class is _always_ frozen.
-	 */
-	int valid;
-};
+	struct {
+		GString *str;
 
-BT_HIDDEN
-void bt_stream_class_freeze(struct bt_stream_class *stream_class);
+		/* NULL or `str->str` above */
+		const char *value;
+	} name;
 
-BT_HIDDEN
-int bt_stream_class_serialize(struct bt_stream_class *stream_class,
-		struct metadata_context *context);
+	uint64_t id;
+	bool assigns_automatic_event_class_id;
+	bool assigns_automatic_stream_id;
+	bool packets_have_discarded_event_counter_snapshot;
+	bool packets_have_packet_counter_snapshot;
+	bool packets_have_default_beginning_cv;
+	bool packets_have_default_end_cv;
+	struct bt_field_type *packet_context_ft;
+	struct bt_field_type *event_header_ft;
+	struct bt_field_type *event_common_context_ft;
+	struct bt_clock_class *default_clock_class;
 
-BT_HIDDEN
-void bt_stream_class_set_byte_order(
-		struct bt_stream_class *stream_class, int byte_order);
+	/* Array of `struct bt_event_class *` */
+	GPtrArray *event_classes;
 
-/* Set stream_class id without checking if the stream class is frozen */
-BT_HIDDEN
-void _bt_stream_class_set_id(struct bt_stream_class *stream_class,
-		int64_t id);
+	/* Pool of `struct bt_field_wrapper *` */
+	struct bt_object_pool event_header_field_pool;
 
-BT_HIDDEN
-int bt_stream_class_set_id_no_check(
-		struct bt_stream_class *stream_class, int64_t id);
+	/* Pool of `struct bt_field_wrapper *` */
+	struct bt_object_pool packet_context_field_pool;
+
+	bool frozen;
+};
 
 BT_HIDDEN
-int bt_stream_class_map_clock_class(
-		struct bt_stream_class *stream_class,
-		struct bt_field_type *packet_context_type,
-		struct bt_field_type *event_header_type);
+void _bt_stream_class_freeze(struct bt_stream_class *stream_class);
+
+#ifdef BT_DEV_MODE
+# define bt_stream_class_freeze		_bt_stream_class_freeze
+#else
+# define bt_stream_class_freeze(_sc)
+#endif
 
 static inline
-struct bt_trace *bt_stream_class_borrow_trace(
+struct bt_trace *bt_stream_class_borrow_trace_inline(
 		struct bt_stream_class *stream_class)
 {
-	assert(stream_class);
-	return (void *) bt_object_borrow_parent(stream_class);
+	BT_ASSERT(stream_class);
+	return (void *) bt_object_borrow_parent(&stream_class->base);
 }
 
 #endif /* BABELTRACE_CTF_IR_STREAM_CLASS_INTERNAL_H */