X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Fctf-text.c;h=b1018c6576f2084fa3fb300225c8b1e72ea98271;hp=82578dca139afb4aeae48e35edebdb48d6942dc8;hb=8d8ed9afdf03dc0808e25c0e68279bb31d54742f;hpb=ccdb988e746c6c074b4fe884f9c6da44f27a2dcb diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c index 82578dca..b1018c65 100644 --- a/formats/ctf-text/ctf-text.c +++ b/formats/ctf-text/ctf-text.c @@ -3,7 +3,9 @@ * * CTF Text Format registration. * - * Copyright 2010, 2011 - Mathieu Desnoyers + * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation + * + * Author: Mathieu Desnoyers * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -19,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -32,7 +34,31 @@ #include #include -struct trace_descriptor *ctf_text_open_trace(const char *path, int flags); +#define NSEC_PER_SEC 1000000000ULL + +int opt_all_field_names, + opt_scope_field_names, + opt_header_field_names, + opt_context_field_names, + opt_payload_field_names, + opt_trace_name, + opt_trace_domain, + opt_trace_procname, + opt_trace_vpid, + opt_loglevel, + opt_delta = 1; + +enum field_item { + ITEM_SCOPE, + ITEM_HEADER, + ITEM_CONTEXT, + ITEM_PAYLOAD, +}; + +struct trace_descriptor *ctf_text_open_trace(const char *collection_path, + const char *path, int flags, + void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset, + int whence), FILE *metadata_fp); void ctf_text_close_trace(struct trace_descriptor *descriptor); static @@ -53,6 +79,77 @@ struct format ctf_text_format = { .close_trace = ctf_text_close_trace, }; +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; + +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"); +} + +int print_field(struct definition *definition) +{ + /* Print all fields in verbose mode */ + if (babeltrace_verbose) + return 1; + + /* Filter out part of the packet context */ + if (definition->path == Q_STREAM_PACKET_CONTEXT_TIMESTAMP_BEGIN) + return 0; + if (definition->path == Q_STREAM_PACKET_CONTEXT_TIMESTAMP_END) + return 0; + if (definition->path == Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED) + return 0; + if (definition->path == Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE) + return 0; + if (definition->path == Q_STREAM_PACKET_CONTEXT_PACKET_SIZE) + return 0; + + return 1; +} + +static +void set_field_names_print(struct ctf_text_stream_pos *pos, enum field_item item) +{ + switch (item) { + case ITEM_SCOPE: + if (opt_all_field_names || opt_scope_field_names) + pos->print_names = 1; + else + pos->print_names = 0; + break; + case ITEM_HEADER: + if (opt_all_field_names || opt_header_field_names) + pos->print_names = 1; + else + pos->print_names = 0; + break; + case ITEM_CONTEXT: + if (opt_all_field_names || opt_context_field_names) + pos->print_names = 1; + else + pos->print_names = 0; + break; + case ITEM_PAYLOAD: + if (opt_all_field_names || opt_payload_field_names) + pos->print_names = 1; + else + pos->print_names = 0; + + break; + default: + assert(0); + } +} + static int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream *stream) @@ -62,52 +159,40 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_class *stream_class = stream->stream_class; int field_nr_saved; struct ctf_event *event_class; - uint64_t id = 0; + struct ctf_stream_event *event; + uint64_t id; int ret; + int dom_print = 0; - /* print event header */ - if (stream_class->event_header) { - struct definition_integer *integer_definition; - struct definition *variant; - - /* lookup event id */ - integer_definition = lookup_integer(&stream_class->event_header->p, "id", FALSE); - if (integer_definition) { - id = integer_definition->value._unsigned; - } else { - struct definition_enum *enum_definition; - - enum_definition = lookup_enum(&stream_class->event_header->p, "id", FALSE); - if (enum_definition) { - id = enum_definition->integer->value._unsigned; - } - } - - variant = lookup_variant(&stream_class->event_header->p, "v"); - if (variant) { - integer_definition = lookup_integer(variant, "id", FALSE); - if (integer_definition) { - id = integer_definition->value._unsigned; - } - } - } + id = stream->event_id; if (id >= stream_class->events_by_id->len) { fprintf(stdout, "[error] Event id %" PRIu64 " is outside range.\n", id); return -EINVAL; } + event = g_ptr_array_index(stream->events_by_id, id); + if (!event) { + fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id); + return -EINVAL; + } event_class = g_ptr_array_index(stream_class->events_by_id, id); - if (!event_class) { + if (!event) { fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id); return -EINVAL; } - if (stream->timestamp) { + if (stream->has_timestamp) { + uint64_t ts_sec, ts_nsec; + + ts_sec = stream->timestamp / NSEC_PER_SEC; + ts_nsec = stream->timestamp % NSEC_PER_SEC; + set_field_names_print(pos, ITEM_HEADER); if (pos->print_names) fprintf(pos->fp, "timestamp = "); else fprintf(pos->fp, "["); - fprintf(pos->fp, "%12" PRIu64, stream->timestamp); + fprintf(pos->fp, "%3" PRIu64 ".%09" PRIu64, + ts_sec, ts_nsec); if (!pos->print_names) fprintf(pos->fp, "]"); @@ -116,6 +201,103 @@ int ctf_text_write_event(struct stream_pos *ppos, else fprintf(pos->fp, " "); } + if (opt_delta && stream->has_timestamp) { + uint64_t delta, delta_sec, delta_nsec; + + set_field_names_print(pos, ITEM_HEADER); + if (pos->print_names) + fprintf(pos->fp, "delta = "); + else + fprintf(pos->fp, "("); + if (pos->last_timestamp != -1ULL) { + delta = stream->timestamp - pos->last_timestamp; + delta_sec = delta / NSEC_PER_SEC; + delta_nsec = delta % NSEC_PER_SEC; + fprintf(pos->fp, "+%" PRIu64 ".%09" PRIu64, + delta_sec, delta_nsec); + } else { + fprintf(pos->fp, "+?.?????????"); + } + if (!pos->print_names) + fprintf(pos->fp, ")"); + + if (pos->print_names) + fprintf(pos->fp, ", "); + else + fprintf(pos->fp, " "); + pos->last_timestamp = stream->timestamp; + } + + if ((opt_trace_name || opt_all_field_names) && stream_class->trace->path[0] != '\0') { + set_field_names_print(pos, ITEM_HEADER); + if (pos->print_names) { + if (opt_trace_name || opt_all_field_names) + fprintf(pos->fp, "trace = "); + } + + fprintf(pos->fp, "%s", stream_class->trace->path); + if (pos->print_names) + fprintf(pos->fp, ", "); + else + fprintf(pos->fp, " "); + } + if ((opt_trace_domain) && stream_class->trace->domain[0] != '\0') { + set_field_names_print(pos, ITEM_HEADER); + if (pos->print_names) { + fprintf(pos->fp, "trace:domain = "); + } + if (opt_trace_domain) + fprintf(pos->fp, "%s", stream_class->trace->domain); + if (pos->print_names) + fprintf(pos->fp, ", "); + dom_print = 1; + } + if ((opt_trace_procname) && stream_class->trace->procname[0] != '\0') { + set_field_names_print(pos, ITEM_HEADER); + if (pos->print_names) { + fprintf(pos->fp, "trace:procname = "); + } else if (dom_print) { + fprintf(pos->fp, ":"); + } + + if (opt_trace_procname) + fprintf(pos->fp, "%s", stream_class->trace->procname); + if (pos->print_names) + fprintf(pos->fp, ", "); + dom_print = 1; + } + if ((opt_trace_vpid) && stream_class->trace->vpid[0] != '\0') { + set_field_names_print(pos, ITEM_HEADER); + if (pos->print_names) { + fprintf(pos->fp, "trace:vpid = "); + } else if (dom_print) { + fprintf(pos->fp, ":"); + } + + if (opt_trace_vpid) + fprintf(pos->fp, "%s", stream_class->trace->vpid); + if (pos->print_names) + fprintf(pos->fp, ", "); + dom_print = 1; + } + if ((opt_loglevel || opt_all_field_names) && event_class->loglevel_identifier != 0) { + set_field_names_print(pos, ITEM_HEADER); + if (pos->print_names) { + fprintf(pos->fp, "loglevel = "); + } else if (dom_print) { + fprintf(pos->fp, ":"); + } + + fprintf(pos->fp, "%s (%lld)", + g_quark_to_string(event_class->loglevel_identifier), + (long long) event_class->loglevel_value); + if (pos->print_names) + fprintf(pos->fp, ", "); + dom_print = 1; + } + if (dom_print && !pos->print_names) + fprintf(pos->fp, " "); + set_field_names_print(pos, ITEM_HEADER); if (pos->print_names) fprintf(pos->fp, "name = "); fprintf(pos->fp, "%s", g_quark_to_string(event_class->name)); @@ -124,57 +306,81 @@ int ctf_text_write_event(struct stream_pos *ppos, else fprintf(pos->fp, ":"); + /* print cpuid field from packet context */ + if (stream->stream_packet_context) { + if (pos->field_nr++ != 0) + fprintf(pos->fp, ","); + set_field_names_print(pos, ITEM_SCOPE); + if (pos->print_names) + fprintf(pos->fp, " stream.packet.context ="); + field_nr_saved = pos->field_nr; + pos->field_nr = 0; + set_field_names_print(pos, ITEM_CONTEXT); + ret = generic_rw(ppos, &stream->stream_packet_context->p); + if (ret) + goto error; + pos->field_nr = field_nr_saved; + } + /* Only show the event header in verbose mode */ - if (babeltrace_verbose && stream_class->event_header) { + if (babeltrace_verbose && stream->stream_event_header) { if (pos->field_nr++ != 0) fprintf(pos->fp, ","); + set_field_names_print(pos, ITEM_SCOPE); if (pos->print_names) fprintf(pos->fp, " stream.event.header ="); field_nr_saved = pos->field_nr; pos->field_nr = 0; - ret = generic_rw(ppos, &stream_class->event_header->p); + set_field_names_print(pos, ITEM_CONTEXT); + ret = generic_rw(ppos, &stream->stream_event_header->p); if (ret) goto error; pos->field_nr = field_nr_saved; } /* print stream-declared event context */ - if (stream_class->event_context) { + if (stream->stream_event_context) { if (pos->field_nr++ != 0) fprintf(pos->fp, ","); + set_field_names_print(pos, ITEM_SCOPE); if (pos->print_names) fprintf(pos->fp, " stream.event.context ="); field_nr_saved = pos->field_nr; pos->field_nr = 0; - ret = generic_rw(ppos, &stream_class->event_context->p); + set_field_names_print(pos, ITEM_CONTEXT); + ret = generic_rw(ppos, &stream->stream_event_context->p); if (ret) goto error; pos->field_nr = field_nr_saved; } /* print event-declared event context */ - if (event_class->context) { + if (event->event_context) { if (pos->field_nr++ != 0) fprintf(pos->fp, ","); + set_field_names_print(pos, ITEM_SCOPE); if (pos->print_names) fprintf(pos->fp, " event.context ="); field_nr_saved = pos->field_nr; pos->field_nr = 0; - ret = generic_rw(ppos, &event_class->context->p); + set_field_names_print(pos, ITEM_CONTEXT); + ret = generic_rw(ppos, &event->event_context->p); if (ret) goto error; pos->field_nr = field_nr_saved; } /* Read and print event payload */ - if (event_class->fields) { + if (event->event_fields) { if (pos->field_nr++ != 0) fprintf(pos->fp, ","); + set_field_names_print(pos, ITEM_SCOPE); if (pos->print_names) fprintf(pos->fp, " event.fields ="); field_nr_saved = pos->field_nr; pos->field_nr = 0; - ret = generic_rw(ppos, &event_class->fields->p); + set_field_names_print(pos, ITEM_PAYLOAD); + ret = generic_rw(ppos, &event->event_fields->p); if (ret) goto error; pos->field_nr = field_nr_saved; @@ -191,13 +397,17 @@ error: } -struct trace_descriptor *ctf_text_open_trace(const char *path, int flags) +struct trace_descriptor *ctf_text_open_trace(const char *collection_path, + const char *path, int flags, + void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset, + int whence), FILE *metadata_fp) { struct ctf_text_stream_pos *pos; FILE *fp; pos = g_new0(struct ctf_text_stream_pos, 1); + pos->last_timestamp = -1ULL; switch (flags & O_ACCMODE) { case O_RDWR: if (!path) @@ -209,7 +419,7 @@ 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->print_names = opt_field_names; + pos->print_names = 0; break; case O_RDONLY: default: