X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Fctf-text.c;h=008762339fdef48d861aca994d5a1f6661fcae40;hp=48ce31b8691081319e7ee35762d87c8a47b579be;hb=b5a8598f01c8e40163449bff173909eff824647b;hpb=caf929fa6105f9dbea79e3c05f9a9cbc7944028a diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c index 48ce31b8..00876233 100644 --- a/formats/ctf-text/ctf-text.c +++ b/formats/ctf-text/ctf-text.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -115,7 +116,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 +127,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 +155,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 +238,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,12 +266,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); - ctf_print_discarded(stderr, stream, 0); - stream->events_discarded = 0; - } + handle_debug_info_event(stream_class, event); if (stream->has_timestamp) { set_field_names_print(pos, ITEM_HEADER); @@ -563,6 +562,7 @@ struct bt_trace_descriptor *ctf_text_open_trace(const char *path, int flags, 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: @@ -582,6 +582,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) {