Merge branch 'master' of ssh://efficios.com/home/efficios/git/babeltrace

[babeltrace.git] / include / babeltrace / ctf / metadata.h

diff --git a/include/babeltrace/ctf/metadata.h b/include/babeltrace/ctf/metadata.h
index 7923e65b48ae4fef7c31570063458d9c8294fb05..e985ee5f034ebae3d7e6fc149c0fcd6e4bf74e50 100644 (file)
--- a/include/babeltrace/ctf/metadata.h
+++ b/include/babeltrace/ctf/metadata.h
@@ -20,41 +20,36 @@
  */
 
 #include <babeltrace/types.h>
+#include <babeltrace/format.h>
+#include <babeltrace/ctf/types.h>
+#include <babeltrace/ctf-ir/metadata.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <uuid/uuid.h>
+#include <assert.h>
 #include <glib.h>
 
-struct ctf_trace;
-struct ctf_stream;
-struct ctf_event;
+#define CTF_MAGIC      0xC1FC1FC1
+#define TSDL_MAGIC     0x75D11D57
 
-struct ctf_trace {
-       struct declaration_scope *scope;        /* root scope */
-       GArray *streams;        /* Array of struct ctf_stream */
-
-       uint64_t major;
-       uint64_t minor;
-       uint8_t uuid[16];
-       uint64_t word_size;
+struct ctf_file_stream {
+       struct ctf_stream parent;
+       struct ctf_stream_pos pos;      /* current stream position */
 };
 
-struct ctf_stream {
-       struct declaration_scope *scope;        /* parent is trace scope */
-       GArray *events_by_id;   /* Array of struct ctf_event indexed by id */
-       GHashTable *event_quark_to_id;  /* GQuark to numeric id */
-
-       uint64_t stream_id;
-       struct declaration_struct *event_header;
-       struct declaration_struct *event_context;
-       struct declaration_struct *packet_context;
-};
-
-
-struct ctf_event {
-       struct declaration_scope *scope;        /* parent is stream scope */
-       GQuark name;
-       uint64_t id;    /* Numeric identifier within the stream */
-       uint64_t stream_id;
-       struct declaration_struct *context;
-       struct declaration_struct *fields;
+#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 */
+       uint32_t checksum;              /* 0 if unused */
+       uint32_t content_size;          /* in bits */
+       uint32_t packet_size;           /* in bits */
+       uint8_t  compression_scheme;    /* 0 if unused */
+       uint8_t  encryption_scheme;     /* 0 if unused */
+       uint8_t  checksum_scheme;       /* 0 if unused */
+       HEADER_END;
 };
 
 #endif /* _BABELTRACE_CTF_METADATA_H */