Pretty-print 0-value timestamps

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

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index 84725eaa1d3d8eb16e94c30b06e36ffbdd4e20cb..14c788c6d704a3c5a1aedccc78f96d3b408f4820 100644 (file)
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -36,27 +36,23 @@ struct ctf_event;
 struct ctf_stream {
        struct ctf_stream_class *stream_class;
        uint64_t timestamp;                     /* Current timestamp, in ns */
+       int has_timestamp;
+       uint64_t stream_id;
 
        struct definition_struct *trace_packet_header;
        struct definition_struct *stream_packet_context;
        struct definition_struct *stream_event_header;
        struct definition_struct *stream_event_context;
-       GPtrArray *events_by_id;                /* Array of struct ctf_file_event pointers indexed by id */
+       GPtrArray *events_by_id;                /* Array of struct ctf_stream_event pointers indexed by id */
        struct definition_scope *parent_def_scope;      /* for initialization */
        int stream_definitions_created;
 };
 
-struct ctf_file_event {
+struct ctf_stream_event {
        struct definition_struct *event_context;
        struct definition_struct *event_fields;
 };
 
-struct ctf_file_stream {
-       uint64_t stream_id;
-       struct ctf_stream stream;
-       struct ctf_stream_pos pos;      /* current stream position */
-};
-
 #define CTF_TRACE_SET_FIELD(ctf_trace, field)                          \
        do {                                                            \
                (ctf_trace)->field_mask |= CTF_TRACE_ ## field;         \
@@ -81,7 +77,7 @@ struct ctf_trace {
        /* innermost definition scope. to be used as parent of stream. */
        struct definition_scope *definition_scope;
        GPtrArray *streams;                     /* Array of struct ctf_stream_class pointers */
-       struct ctf_file_stream metadata;
+       struct ctf_stream *metadata;
 
        /* Declarations only used when parsing */
        struct declaration_struct *packet_header_decl;
@@ -142,7 +138,7 @@ struct ctf_stream_class {
                CTF_STREAM_stream_id =  (1 << 0),
        } field_mask;
 
-       GPtrArray *files;                       /* Array of struct ctf_file_stream pointers */
+       GPtrArray *streams;     /* Array of struct ctf_stream pointers */
 };
 
 #define CTF_EVENT_SET_FIELD(ctf_event, field)                          \