Standardise spelling of debug info

[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 137e3b58652075fcf26f48e48ded13bbd55fc12d..07706bb1e005d62ff97a42265274817b0a63bbdb 100644 (file)
--- 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 <babeltrace/types.h>
 #include <babeltrace/format.h>
+#include <babeltrace/format-internal.h>
 #include <babeltrace/ctf/types.h>
 #include <sys/types.h>
 #include <dirent.h>
-#include <babeltrace/uuid.h>
+#include <babeltrace/compat/uuid.h>
 #include <assert.h>
 #include <glib.h>
 
@@ -33,6 +42,17 @@ 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;
@@ -54,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 {
@@ -121,14 +142,21 @@ struct ctf_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;         \
@@ -156,10 +184,16 @@ struct ctf_tracer_env {
        char sysname[TRACER_ENV_LEN];
        char release[TRACER_ENV_LEN];
        char version[TRACER_ENV_LEN];
+       char tracer_name[TRACER_ENV_LEN];
 };
 
+#ifdef ENABLE_DEBUG_INFO
+struct debug_info;
+#endif
+
 struct ctf_trace {
-       struct trace_descriptor parent;
+       struct bt_trace_descriptor parent;
+
        /* root scope */
        struct declaration_scope *root_declaration_scope;
 
@@ -168,13 +202,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;
+       char *metadata_string;
+       int metadata_packetized;
        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;
+       struct ctf_scanner *scanner;
+       int restart_root_decl;
 
        uint64_t major;
        uint64_t minor;
@@ -195,12 +230,10 @@ struct ctf_trace {
        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;
+#ifdef ENABLE_DEBUG_INFO
+       /* Debug information for this trace */
+       struct debug_info *debug_info;
+#endif
 };
 
 #define CTF_STREAM_SET_FIELD(ctf_stream, field)                                \
@@ -219,7 +252,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;
@@ -256,7 +289,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;