X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fmetadata.h;h=e5c3240c5e039d1620cb240d6d38a034c3772b27;hp=024b50f1c4daed84e7d0cfe3c06822488dd365c3;hb=b448902b7c2d8fa734e0d5cb1e6acbb009db97e4;hpb=98a0490342a1b8f8841ef52aaaef2cef11782ff1 diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h index 024b50f1..e5c3240c 100644 --- a/include/babeltrace/ctf-ir/metadata.h +++ b/include/babeltrace/ctf-ir/metadata.h @@ -29,37 +29,39 @@ #include struct ctf_trace; -struct ctf_stream_class; -struct ctf_stream; -struct ctf_event; -struct ctf_stream; +struct ctf_stream_declaration; +struct ctf_event_declaration; struct ctf_clock; +struct ctf_callsite; -struct ctf_stream { - struct ctf_stream_class *stream_class; - uint64_t timestamp; /* Current timestamp, in ns */ +struct ctf_stream_definition { + struct ctf_stream_declaration *stream_class; + uint64_t real_timestamp; /* Current timestamp, in ns */ + uint64_t cycles_timestamp; /* Current timestamp, in cycles */ 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_stream_event pointers indexed by id */ + GPtrArray *events_by_id; /* Array of struct ctf_event_definition 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 */ + uint64_t events_discarded; + uint64_t prev_real_timestamp; /* Start-of-last-packet timestamp in ns */ + uint64_t prev_real_timestamp_end; /* End-of-last-packet timestamp in ns */ + uint64_t prev_cycles_timestamp; /* Start-of-last-packet timestamp in cycles */ + uint64_t prev_cycles_timestamp_end; /* End-of-last-packet timestamp in cycles */ }; -struct ctf_stream_event { +struct ctf_event_definition { + struct ctf_stream_definition *stream; struct definition_struct *event_context; struct definition_struct *event_fields; }; @@ -100,6 +102,40 @@ struct ctf_clock { } field_mask; }; +#define CTF_CALLSITE_SET_FIELD(ctf_callsite, field) \ + do { \ + (ctf_callsite)->field_mask |= CTF_CALLSITE_ ## field; \ + } while (0) + +#define CTF_CALLSITE_FIELD_IS_SET(ctf_callsite, field) \ + ((ctf_callsite)->field_mask & CTF_CALLSITE_ ## field) + +#define CTF_CALLSITE_GET_FIELD(ctf_callsite, field) \ + ({ \ + assert(CTF_CALLSITE_FIELD_IS_SET(ctf_callsite, field)); \ + (ctf_callsite)->(field); \ + }) + +struct ctf_callsite { + GQuark name; /* event name associated with callsite */ + char *func; + char *file; + uint64_t line; + uint64_t ip; + struct bt_list_head node; + enum { /* Fields populated mask */ + CTF_CALLSITE_name = (1U << 0), + CTF_CALLSITE_func = (1U << 1), + CTF_CALLSITE_file = (1U << 2), + CTF_CALLSITE_line = (1U << 3), + CTF_CALLSITE_ip = (1U << 4), + } field_mask; +}; + +struct ctf_callsite_dups { + struct bt_list_head head; +}; + #define CTF_TRACE_SET_FIELD(ctf_trace, field) \ do { \ (ctf_trace)->field_mask |= CTF_TRACE_ ## field; \ @@ -122,6 +158,7 @@ struct ctf_tracer_env { /* All strings below: "" if unset. */ char procname[TRACER_ENV_LEN]; + char hostname[TRACER_ENV_LEN]; char domain[TRACER_ENV_LEN]; char sysname[TRACER_ENV_LEN]; char release[TRACER_ENV_LEN]; @@ -136,11 +173,13 @@ struct ctf_trace { struct declaration_scope *declaration_scope; /* 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_stream *metadata; + GPtrArray *streams; /* Array of struct ctf_stream_declaration pointers */ + struct ctf_stream_definition *metadata; GHashTable *clocks; + GHashTable *callsites; struct ctf_clock *single_clock; /* currently supports only one clock */ struct trace_collection *collection; /* Container of this trace */ + GPtrArray *event_declarations; /* Array of all the struct bt_ctf_event_decl */ struct declaration_struct *packet_header_decl; @@ -185,13 +224,13 @@ struct ctf_trace { (ctf_stream)->(field); \ }) -struct ctf_stream_class { +struct ctf_stream_declaration { struct ctf_trace *trace; /* parent is lexical scope conaining the stream 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 */ + GPtrArray *events_by_id; /* Array of struct ctf_event_declaration pointers indexed by id */ GHashTable *event_quark_to_id; /* GQuark to numeric id */ struct declaration_struct *packet_context_decl; @@ -204,7 +243,7 @@ struct ctf_stream_class { CTF_STREAM_stream_id = (1 << 0), } field_mask; - GPtrArray *streams; /* Array of struct ctf_stream pointers */ + GPtrArray *streams; /* Array of struct ctf_stream_definition pointers */ }; #define CTF_EVENT_SET_FIELD(ctf_event, field) \ @@ -221,9 +260,9 @@ struct ctf_stream_class { (ctf_event)->(field); \ }) -struct ctf_event { +struct ctf_event_declaration { /* stream mapped by stream_id */ - struct ctf_stream_class *stream; + struct ctf_stream_declaration *stream; /* parent is lexical scope conaining the event scope */ struct declaration_scope *declaration_scope; @@ -234,12 +273,14 @@ struct ctf_event { uint64_t id; /* Numeric identifier within the stream */ uint64_t stream_id; int loglevel; + GQuark model_emf_uri; enum { /* Fields populated mask */ CTF_EVENT_name = (1 << 0), CTF_EVENT_id = (1 << 1), CTF_EVENT_stream_id = (1 << 2), CTF_EVENT_loglevel = (1 << 4), + CTF_EVENT_model_emf_uri = (1 << 5), } field_mask; };