X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Fmetadata.h;h=453c9f7085276de0b4ba5eb6798b475f5d6d7363;hp=c197624793f932a9a3fb4495ec648c90a1760385;hb=0d0f514904a3ebb85775abceed30da0675f55cc6;hpb=a0fe7d97d4a551665af7bd91f7571dc785a75951

diff --git a/include/babeltrace/ctf/metadata.h b/include/babeltrace/ctf/metadata.h
index c1976247..453c9f70 100644
--- a/include/babeltrace/ctf/metadata.h
+++ b/include/babeltrace/ctf/metadata.h
@@ -96,6 +96,9 @@ struct ctf_trace {
 	DIR *dir;
 	int dirfd;
 	int flags;		/* open flags */
+
+	/* Heap of streams, ordered to always get the lowest timestam */
+	struct ptr_heap *stream_heap;
 };
 
 #define CTF_STREAM_SET_FIELD(ctf_stream, field)				\
@@ -179,6 +182,9 @@ struct ctf_event {
 	} field_mask;
 };
 
+#define HEADER_END		char end_field
+#define header_sizeof(type)	offsetof(typeof(type), end_field)
+
 struct metadata_packet_header {
 	uint32_t magic;			/* 0x75D11D57 */
 	uint8_t  uuid[16];		/* Unique Universal Identifier */
@@ -188,6 +194,7 @@ struct metadata_packet_header {
 	uint8_t  compression_scheme;	/* 0 if unused */
 	uint8_t  encryption_scheme;	/* 0 if unused */
 	uint8_t  checksum_scheme;	/* 0 if unused */
-} __attribute__((packed));
+	HEADER_END;
+};
 
 #endif /* _BABELTRACE_CTF_METADATA_H */