struct ctf_stream;
struct ctf_event;
-#define CTF_TRACE_SET_FIELD(ctf_trace, field, value) \
+#define CTF_TRACE_SET_FIELD(ctf_trace, field) \
do { \
- (ctf_trace)->(field) = (value); \
(ctf_trace)->field_mask |= CTF_TRACE_ ## field; \
} while (0)
struct ctf_trace {
- /* root scope */
- struct type_scope *root_type_scope;
/* root scope */
struct declaration_scope *root_declaration_scope;
- struct type_scope *type_scope;
struct declaration_scope *declaration_scope;
GPtrArray *streams; /* Array of struct ctf_stream pointers*/
uint64_t major;
uint64_t minor;
uuid_t uuid;
- uint64_t word_size;
+ int byte_order;
enum { /* Fields populated mask */
CTF_TRACE_major = (1U << 0),
CTF_TRACE_minor = (1U << 1),
CTF_TRACE_uuid = (1U << 2),
- CTF_TRACE_word_size = (1U << 3),
} field_mask;
};
-#define CTF_STREAM_SET_FIELD(ctf_stream, field, value) \
+#define CTF_STREAM_SET_FIELD(ctf_stream, field) \
do { \
- (ctf_stream)->(field) = (value); \
(ctf_stream)->field_mask |= CTF_STREAM_ ## field; \
} while (0)
struct ctf_stream {
struct ctf_trace *trace;
/* parent is lexical scope conaining the stream scope */
- struct type_scope *type_scope;
- /* parent is trace scope */
struct declaration_scope *declaration_scope;
+ /* innermost definition scope. to be used as parent of event. */
+ struct definition_scope *definition_scope;
GPtrArray *events_by_id; /* Array of struct ctf_event pointers indexed by id */
GHashTable *event_quark_to_id; /* GQuark to numeric id */
- struct declaration_struct *event_header;
- struct declaration_struct *event_context;
- struct declaration_struct *packet_context;
+ /* Declarations only used when parsing */
+ struct declaration_struct *packet_context_decl;
+ struct declaration_struct *event_header_decl;
+ struct declaration_struct *event_context_decl;
+
+ /* Definitions used afterward */
+ struct definition_struct *packet_context;
+ struct definition_struct *event_header;
+ struct definition_struct *event_context;
uint64_t stream_id;
/* stream mapped by stream_id */
struct ctf_stream *stream;
/* parent is lexical scope conaining the event scope */
- struct type_scope *type_scope;
- /* parent is stream scope */
struct declaration_scope *declaration_scope;
- struct declaration_struct *context;
- struct declaration_struct *fields;
+
+ /* Declarations only used when parsing */
+ struct declaration_struct *context_decl;
+ struct declaration_struct *fields_decl;
+
+ /* Definitions used afterward */
+ struct definition_struct *context;
+ struct definition_struct *fields;
GQuark name;
uint64_t id; /* Numeric identifier within the stream */