X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fmetadata.h;h=187cfdbcf9e3359f9f6ec330fe3bf8121520eb10;hp=63a6c2a9b4a9b9aa0d28259fd9ca8adb39937e3e;hb=61cf588beae752e5ddfc60b6b5310f769ac9e852;hpb=bb919dd077169b5ee049ba3fc82f8555648cb22e diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h index 63a6c2a9..187cfdbc 100644 --- a/include/babeltrace/ctf-ir/metadata.h +++ b/include/babeltrace/ctf-ir/metadata.h @@ -17,14 +17,23 @@ * * 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 @@ -32,6 +41,18 @@ struct ctf_trace; 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_packet_timestamp { + struct ctf_stream_packet_limits cycles; + struct ctf_stream_packet_limits real; +}; struct ctf_stream_definition { struct ctf_stream_declaration *stream_class; @@ -53,10 +74,11 @@ struct ctf_stream_definition { /* Event discarded information */ 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 */ + /* 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_event_definition { @@ -89,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. + */ + int64_t offset_s; + /* + * Fine clock offset from Epoch, in (1/freq) units. + * It can be negative. */ - uint64_t offset_s; - /* Fine clock offset from Epoch, in (1/freq) units. */ - uint64_t offset; + int64_t offset; int absolute; enum { /* Fields populated mask */ @@ -101,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; \ @@ -131,7 +191,8 @@ struct ctf_tracer_env { }; struct ctf_trace { - struct trace_descriptor parent; + struct bt_trace_descriptor parent; + /* root scope */ struct declaration_scope *root_declaration_scope; @@ -140,12 +201,14 @@ struct ctf_trace { struct definition_scope *definition_scope; GPtrArray *streams; /* Array of struct ctf_stream_declaration pointers */ struct ctf_stream_definition *metadata; - GHashTable *clocks; - struct ctf_clock *single_clock; /* currently supports only one clock */ - struct trace_collection *collection; /* Container of this trace */ + 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; @@ -165,13 +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]; - - struct bt_context *ctx; - struct bt_trace_handle *handle; }; #define CTF_STREAM_SET_FIELD(ctf_stream, field) \ @@ -190,7 +246,7 @@ struct ctf_trace { 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; @@ -227,7 +283,7 @@ struct ctf_stream_declaration { struct ctf_event_declaration { /* stream mapped by stream_id */ struct ctf_stream_declaration *stream; - /* parent is lexical scope conaining the event scope */ + /* parent is lexical scope containing the event scope */ struct declaration_scope *declaration_scope; struct declaration_struct *context_decl; @@ -237,12 +293,14 @@ struct ctf_event_declaration { 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; };