Standardise spelling of debug info

[babeltrace.git] / formats / ctf-text / ctf-text.c

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index b87718b58ddecabeaa66f7f6de0cfc3bc3701404..cc22336ca5d33af0fe07c6c7b577b5e999a9a021 100644 (file)
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -31,6 +31,7 @@
 #include <babeltrace/ctf/metadata.h>
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/ctf/events-internal.h>
+#include <babeltrace/trace-debug-info.h>
 #include <inttypes.h>
 #include <sys/mman.h>
 #include <errno.h>
@@ -59,7 +60,8 @@ int opt_all_field_names,
        opt_loglevel_field,
        opt_emf_field,
        opt_callsite_field,
-       opt_delta_field = 1;
+       opt_delta_field = 1,
+       opt_debug_info_full_path;
 
 enum field_item {
        ITEM_SCOPE,
@@ -115,7 +117,8 @@ static GQuark Q_STREAM_PACKET_CONTEXT_TIMESTAMP_BEGIN,
        Q_STREAM_PACKET_CONTEXT_TIMESTAMP_END,
        Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED,
        Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE,
-       Q_STREAM_PACKET_CONTEXT_PACKET_SIZE;
+       Q_STREAM_PACKET_CONTEXT_PACKET_SIZE,
+       Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM;
 
 static
 void __attribute__((constructor)) init_quarks(void)
@@ -125,6 +128,7 @@ void __attribute__((constructor)) init_quarks(void)
        Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED = g_quark_from_static_string("stream.packet.context.events_discarded");
        Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE = g_quark_from_static_string("stream.packet.context.content_size");
        Q_STREAM_PACKET_CONTEXT_PACKET_SIZE = g_quark_from_static_string("stream.packet.context.packet_size");
+       Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM = g_quark_from_static_string("stream.packet.context.packet_seq_num");
 }
 
 static
@@ -152,6 +156,8 @@ int print_field(struct bt_definition *definition)
                return 0;
        if (definition->path == Q_STREAM_PACKET_CONTEXT_PACKET_SIZE)
                return 0;
+       if (definition->path == Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM)
+               return 0;
 
        return 1;
 }
@@ -233,7 +239,6 @@ const char *print_loglevel(int value)
 
 static
 int ctf_text_write_event(struct bt_stream_pos *ppos, struct ctf_stream_definition *stream)
-                        
 {
        struct ctf_text_stream_pos *pos =
                container_of(ppos, struct ctf_text_stream_pos, parent);
@@ -262,28 +267,7 @@ int ctf_text_write_event(struct bt_stream_pos *ppos, struct ctf_stream_definitio
                return -EINVAL;
        }
 
-       /* Print events discarded */
-       if (stream->events_discarded) {
-               fflush(pos->fp);
-               fprintf(stderr, "[warning] Tracer discarded %" PRIu64 " events between [",
-                       stream->events_discarded);
-               if (opt_clock_cycles) {
-                       ctf_print_timestamp(stderr, stream,
-                                       stream->prev_cycles_timestamp);
-                       fprintf(stderr, "] and [");
-                       ctf_print_timestamp(stderr, stream,
-                                       stream->prev_cycles_timestamp_end);
-               } else {
-                       ctf_print_timestamp(stderr, stream,
-                                       stream->prev_real_timestamp);
-                       fprintf(stderr, "] and [");
-                       ctf_print_timestamp(stderr, stream,
-                                       stream->prev_real_timestamp_end);
-               }
-               fprintf(stderr, "]. You should consider recording a new trace with larger buffers or with fewer events enabled.\n");
-               fflush(stderr);
-               stream->events_discarded = 0;
-       }
+       handle_debug_info_event(stream_class, event);
 
        if (stream->has_timestamp) {
                set_field_names_print(pos, ITEM_HEADER);
@@ -304,7 +288,7 @@ int ctf_text_write_event(struct bt_stream_pos *ppos, struct ctf_stream_definitio
                else
                        fprintf(pos->fp, " ");
        }
-       if ((opt_delta_field || opt_all_fields) && stream->has_timestamp) {
+       if (opt_delta_field && stream->has_timestamp) {
                uint64_t delta, delta_sec, delta_nsec;
 
                set_field_names_print(pos, ITEM_HEADER);
@@ -332,12 +316,12 @@ int ctf_text_write_event(struct bt_stream_pos *ppos, struct ctf_stream_definitio
                pos->last_cycles_timestamp = stream->cycles_timestamp;
        }
 
-       if ((opt_trace_field || opt_all_fields) && stream_class->trace->path[0] != '\0') {
+       if ((opt_trace_field || opt_all_fields) && stream_class->trace->parent.path[0] != '\0') {
                set_field_names_print(pos, ITEM_HEADER);
                if (pos->print_names) {
                        fprintf(pos->fp, "trace = ");
                }
-               fprintf(pos->fp, "%s", stream_class->trace->path);
+               fprintf(pos->fp, "%s", stream_class->trace->parent.path);
                if (pos->print_names)
                        fprintf(pos->fp, ", ");
                else
@@ -563,6 +547,10 @@ struct bt_trace_descriptor *ctf_text_open_trace(const char *path, int flags,
        FILE *fp;
 
        pos = g_new0(struct ctf_text_stream_pos, 1);
+       if (!pos) {
+               goto error;
+       }
+       init_trace_descriptor(&pos->trace_descriptor);
 
        pos->last_real_timestamp = -1ULL;
        pos->last_cycles_timestamp = -1ULL;
@@ -577,7 +565,9 @@ struct bt_trace_descriptor *ctf_text_open_trace(const char *path, int flags,
                pos->fp = fp;
                pos->parent.rw_table = write_dispatch_table;
                pos->parent.event_cb = ctf_text_write_event;
+               pos->parent.trace = &pos->trace_descriptor;
                pos->print_names = 0;
+               babeltrace_ctf_console_output++;
                break;
        case O_RDONLY:
        default:
@@ -597,6 +587,8 @@ int ctf_text_close_trace(struct bt_trace_descriptor *td)
        int ret;
        struct ctf_text_stream_pos *pos =
                container_of(td, struct ctf_text_stream_pos, trace_descriptor);
+
+       babeltrace_ctf_console_output--;
        if (pos->fp != stdout) {
                ret = fclose(pos->fp);
                if (ret) {