X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fmetadata.h;h=187cfdbcf9e3359f9f6ec330fe3bf8121520eb10;hp=29d0fd492ec34d72d481d391eeb077b7b52e1919;hb=61cf588beae752e5ddfc60b6b5310f769ac9e852;hpb=bf94ab2bcad1aa584a1ecc763ce390d583b62f0c diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h index 29d0fd49..187cfdbc 100644 --- a/include/babeltrace/ctf-ir/metadata.h +++ b/include/babeltrace/ctf-ir/metadata.h @@ -17,27 +17,47 @@ * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #include #include +#include #include #include #include -#include +#include #include #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_scanner; + +struct ctf_stream_packet_limits { + uint64_t begin; + uint64_t end; +}; -struct ctf_stream { - struct ctf_stream_class *stream_class; - uint64_t timestamp; /* Current timestamp, in ns */ +struct ctf_stream_packet_timestamp { + struct ctf_stream_packet_limits cycles; + struct ctf_stream_packet_limits real; +}; + +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; @@ -46,19 +66,23 @@ struct ctf_stream { 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; + /* Trace packets lost */ + uint64_t packets_lost; + struct ctf_stream_packet_timestamp prev; + struct ctf_stream_packet_timestamp current; + char path[PATH_MAX]; /* Path to stream. '\0' for mmap traces */ }; -struct ctf_stream_event { +struct ctf_event_definition { + struct ctf_stream_definition *stream; struct definition_struct *event_context; struct definition_struct *event_fields; }; @@ -87,10 +111,14 @@ struct ctf_clock { /* * The offset from Epoch is: offset_s + (offset * (1/freq)) * Coarse clock offset from Epoch (in seconds). + * It can be negative. */ - uint64_t offset_s; - /* Fine clock offset from Epoch, in (1/freq) units. */ - uint64_t offset; + int64_t offset_s; + /* + * Fine clock offset from Epoch, in (1/freq) units. + * It can be negative. + */ + int64_t offset; int absolute; enum { /* Fields populated mask */ @@ -99,6 +127,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; \ @@ -121,6 +183,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]; @@ -128,24 +191,28 @@ struct ctf_tracer_env { }; struct ctf_trace { - struct trace_descriptor parent; + struct bt_trace_descriptor parent; + /* root scope */ struct declaration_scope *root_declaration_scope; 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; - GHashTable *clocks; - struct ctf_clock *single_clock; /* currently supports only one clock */ - struct trace_collection *collection; /* Container of this trace */ + GPtrArray *streams; /* Array of struct ctf_stream_declaration pointers */ + struct ctf_stream_definition *metadata; + char *metadata_string; + int metadata_packetized; + GHashTable *callsites; + GPtrArray *event_declarations; /* Array of all the struct bt_ctf_event_decl */ struct declaration_struct *packet_header_decl; + struct ctf_scanner *scanner; + int restart_root_decl; uint64_t major; uint64_t minor; - uuid_t uuid; + unsigned char uuid[BABELTRACE_UUID_LEN]; int byte_order; /* trace BYTE_ORDER. 0 if unset. */ struct ctf_tracer_env env; @@ -161,10 +228,6 @@ struct ctf_trace { DIR *dir; int dirfd; int flags; /* open flags */ - - /* 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) \ @@ -181,13 +244,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 */ + /* parent is lexical scope containing 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; @@ -200,7 +263,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) \ @@ -217,10 +280,10 @@ struct ctf_stream_class { (ctf_event)->(field); \ }) -struct ctf_event { +struct ctf_event_declaration { /* stream mapped by stream_id */ - struct ctf_stream_class *stream; - /* parent is lexical scope conaining the event scope */ + struct ctf_stream_declaration *stream; + /* parent is lexical scope containing the event scope */ struct declaration_scope *declaration_scope; struct declaration_struct *context_decl; @@ -230,12 +293,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; };