Fix missing uuid wrapper change
[babeltrace.git] / include / babeltrace / ctf-ir / metadata.h
index 84725eaa1d3d8eb16e94c30b06e36ffbdd4e20cb..593be445cafd8b455f23ac64a84ed3215104010f 100644 (file)
@@ -24,7 +24,7 @@
 #include <babeltrace/ctf/types.h>
 #include <sys/types.h>
 #include <dirent.h>
-#include <uuid/uuid.h>
+#include <babeltrace/uuid.h>
 #include <assert.h>
 #include <glib.h>
 
@@ -32,29 +32,72 @@ struct ctf_trace;
 struct ctf_stream_class;
 struct ctf_stream;
 struct ctf_event;
+struct ctf_stream;
+struct ctf_clock;
 
 struct ctf_stream {
        struct ctf_stream_class *stream_class;
        uint64_t timestamp;                     /* Current timestamp, in ns */
+       uint64_t event_id;                      /* Current event ID */
+       int has_timestamp;
+       uint64_t stream_id;
+       int consumed;                           /* Last packet used by caller */
 
        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_clock *current_clock;
+
+       /* Event discarded information */
+       uint32_t events_discarded;
+       uint64_t prev_timestamp;        /* Last event */
+       uint64_t prev_timestamp_end;    /* End-of-packet timestamp */
 };
 
-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_CLOCK_SET_FIELD(ctf_clock, field)                          \
+       do {                                                            \
+               (ctf_clock)->field_mask |= CTF_CLOCK_ ## field;         \
+       } while (0)
+
+#define CTF_CLOCK_FIELD_IS_SET(ctf_clock, field)                       \
+               ((ctf_clock)->field_mask & CTF_CLOCK_ ## field)
+
+#define CTF_CLOCK_GET_FIELD(ctf_clock, field)                          \
+       ({                                                              \
+               assert(CTF_CLOCK_FIELD_IS_SET(ctf_clock, field));       \
+               (ctf_clock)->(field);                                   \
+       })
+
+struct ctf_clock {
+       GQuark name;
+       GQuark uuid;
+       char *description;
+       uint64_t freq;  /* frequency, in HZ */
+       /* precision in seconds is: precision * (1/freq) */
+       uint64_t precision;
+       /*
+        * The offset from Epoch is: offset_s + (offset * (1/freq))
+        * Coarse clock offset from Epoch (in seconds).
+        */
+       uint64_t offset_s;
+       /* Fine clock offset from Epoch, in (1/freq) units. */
+       uint64_t offset;
+       int absolute;
+
+       enum {                                  /* Fields populated mask */
+               CTF_CLOCK_name          =       (1U << 0),
+               CTF_CLOCK_freq          =       (1U << 1),
+       } field_mask;
 };
 
 #define CTF_TRACE_SET_FIELD(ctf_trace, field)                          \
@@ -71,6 +114,19 @@ struct ctf_file_stream {
                (ctf_trace)->(field);                                   \
        })
 
+#define TRACER_ENV_LEN 128
+
+/* tracer-specific environment */
+struct ctf_tracer_env {
+       int vpid;               /* negative if unset */
+
+       /* All strings below: "" if unset. */
+       char procname[TRACER_ENV_LEN];
+       char domain[TRACER_ENV_LEN];
+       char sysname[TRACER_ENV_LEN];
+       char release[TRACER_ENV_LEN];
+       char version[TRACER_ENV_LEN];
+};
 
 struct ctf_trace {
        struct trace_descriptor parent;
@@ -81,15 +137,18 @@ 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;
+       GHashTable *clocks;
+       struct ctf_clock *single_clock;         /* currently supports only one clock */
+       struct trace_collection *collection;    /* Container of this trace */
 
-       /* Declarations only used when parsing */
        struct declaration_struct *packet_header_decl;
 
        uint64_t major;
        uint64_t minor;
-       uuid_t uuid;
+       unsigned char * uuid;
        int byte_order;         /* trace BYTE_ORDER. 0 if unset. */
+       struct ctf_tracer_env env;
 
        enum {                                  /* Fields populated mask */
                CTF_TRACE_major         =       (1U << 0),
@@ -106,6 +165,7 @@ struct ctf_trace {
 
        /* Heap of streams, ordered to always get the lowest timestam */
        struct ptr_heap *stream_heap;
+       char path[PATH_MAX];
 };
 
 #define CTF_STREAM_SET_FIELD(ctf_stream, field)                                \
@@ -131,7 +191,6 @@ struct ctf_stream_class {
        GPtrArray *events_by_id;                /* Array of struct ctf_event pointers indexed by id */
        GHashTable *event_quark_to_id;          /* GQuark to numeric id */
 
-       /* Declarations only used when parsing */
        struct declaration_struct *packet_context_decl;
        struct declaration_struct *event_header_decl;
        struct declaration_struct *event_context_decl;
@@ -142,7 +201,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)                          \
@@ -165,18 +224,19 @@ struct ctf_event {
        /* parent is lexical scope conaining the event scope */
        struct declaration_scope *declaration_scope;
 
-       /* Declarations only used when parsing */
        struct declaration_struct *context_decl;
        struct declaration_struct *fields_decl;
 
        GQuark name;
        uint64_t id;            /* Numeric identifier within the stream */
        uint64_t stream_id;
+       int loglevel;
 
        enum {                                  /* Fields populated mask */
-               CTF_EVENT_name  =       (1 << 0),
-               CTF_EVENT_id    =       (1 << 1),
-               CTF_EVENT_stream_id =   (1 << 2),
+               CTF_EVENT_name  =               (1 << 0),
+               CTF_EVENT_id    =               (1 << 1),
+               CTF_EVENT_stream_id =           (1 << 2),
+               CTF_EVENT_loglevel =            (1 << 4),
        } field_mask;
 };
 
This page took 0.025711 seconds and 4 git commands to generate.