X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf-text%2Fctf-text.c;h=f4cdf105d4f7938bf9ad3219b228e44998fe64cb;hb=f3985ab106d89d8e764c1a8dd0c8bda09b755d10;hp=d344c1c0ce7d193532165bec1cd02456a9cdb57c;hpb=71dd417a2b700c2315ef9919104572df1bc83f7a;p=babeltrace.git diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c index d344c1c0..f4cdf105 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 @@ -42,7 +43,7 @@ #include #include -#define NSEC_PER_SEC 1000000000ULL +#define NSEC_PER_SEC 1000000000LL int opt_all_field_names, opt_scope_field_names, @@ -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, @@ -87,11 +89,11 @@ enum bt_loglevel { }; static -struct trace_descriptor *ctf_text_open_trace(const char *path, int flags, - void (*packet_seek)(struct stream_pos *pos, size_t index, +struct bt_trace_descriptor *ctf_text_open_trace(const char *path, int flags, + void (*packet_seek)(struct bt_stream_pos *pos, size_t index, int whence), FILE *metadata_fp); static -int ctf_text_close_trace(struct trace_descriptor *descriptor); +int ctf_text_close_trace(struct bt_trace_descriptor *descriptor); static rw_dispatch write_dispatch_table[] = { @@ -106,7 +108,7 @@ rw_dispatch write_dispatch_table[] = { }; static -struct format ctf_text_format = { +struct bt_format ctf_text_format = { .open_trace = ctf_text_open_trace, .close_trace = ctf_text_close_trace, }; @@ -115,16 +117,18 @@ 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) { - Q_STREAM_PACKET_CONTEXT_TIMESTAMP_BEGIN = g_quark_from_static_string("stream.packet.context.timestamp_begin"); - Q_STREAM_PACKET_CONTEXT_TIMESTAMP_END = g_quark_from_static_string("stream.packet.context.timestamp_end"); - 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_TIMESTAMP_BEGIN = g_quark_from_string("stream.packet.context.timestamp_begin"); + Q_STREAM_PACKET_CONTEXT_TIMESTAMP_END = g_quark_from_string("stream.packet.context.timestamp_end"); + Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED = g_quark_from_string("stream.packet.context.events_discarded"); + Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE = g_quark_from_string("stream.packet.context.content_size"); + Q_STREAM_PACKET_CONTEXT_PACKET_SIZE = g_quark_from_string("stream.packet.context.packet_size"); + Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM = g_quark_from_string("stream.packet.context.packet_seq_num"); } static @@ -132,10 +136,18 @@ struct ctf_callsite_dups *ctf_trace_callsite_lookup(struct ctf_trace *trace, GQuark callsite_name) { return g_hash_table_lookup(trace->callsites, - (gpointer) (unsigned long) callsite_name); + GUINT_TO_POINTER(callsite_name)); } -int print_field(struct definition *definition) +void bt_ctf_text_hook(void) +{ + /* + * Dummy function to prevent the linker from discarding this format as + * "unused" in static builds. + */ +} + +int print_field(struct bt_definition *definition) { /* Print all fields in verbose mode */ if (babeltrace_verbose) @@ -152,6 +164,8 @@ int print_field(struct 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; } @@ -232,8 +246,7 @@ const char *print_loglevel(int value) } static -int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *stream) - +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 +275,7 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition * 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 +296,7 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition * 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 +324,12 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition * 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 @@ -358,6 +350,8 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition * set_field_names_print(pos, ITEM_HEADER); if (pos->print_names) { fprintf(pos->fp, "trace:domain = "); + } else if (dom_print) { + fprintf(pos->fp, ":"); } fprintf(pos->fp, "%s", stream_class->trace->env.domain); if (pos->print_names) @@ -555,14 +549,18 @@ error: } static -struct trace_descriptor *ctf_text_open_trace(const char *path, int flags, - void (*packet_seek)(struct stream_pos *pos, size_t index, +struct bt_trace_descriptor *ctf_text_open_trace(const char *path, int flags, + void (*packet_seek)(struct bt_stream_pos *pos, size_t index, int whence), FILE *metadata_fp) { struct ctf_text_stream_pos *pos; 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 +575,9 @@ struct 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: @@ -592,15 +592,19 @@ error: } static -int ctf_text_close_trace(struct trace_descriptor *td) +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); - ret = fclose(pos->fp); - if (ret) { - perror("Error on fclose"); - return -1; + + babeltrace_ctf_console_output--; + if (pos->fp != stdout) { + ret = fclose(pos->fp); + if (ret) { + perror("Error on fclose"); + return -1; + } } g_free(pos); return 0; @@ -611,7 +615,7 @@ void __attribute__((constructor)) ctf_text_init(void) { int ret; - ctf_text_format.name = g_quark_from_static_string("text"); + ctf_text_format.name = g_quark_from_string("text"); ret = bt_register_format(&ctf_text_format); assert(!ret); }