X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Fctf-text.c;h=1b3e4bc73438716289662696e8da6c4b33410c2e;hp=882e0620eed83159510f844d9c1d5ed4e34fccff;hb=d86d62f815e8fce21a7efb2cc0811720d62b0c11;hpb=764af3f43c289a0a5cd8bf6fd85d9361ae17a253 diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c index 882e0620..1b3e4bc7 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,28 @@ #include #include -struct trace_descriptor *ctf_text_open_trace(const char *path, int flags); +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; + +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 +76,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) @@ -60,103 +154,205 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_text_stream_pos *pos = container_of(ppos, struct ctf_text_stream_pos, parent); struct ctf_stream_class *stream_class = stream->stream_class; + int field_nr_saved; struct ctf_event *event_class; - uint64_t id = 0; - int len_index; + struct ctf_stream_event *event; + uint64_t id; int ret; - int field_nr = 0; - - /* print event header */ - if (stream_class->event_header) { - /* lookup event id */ - len_index = struct_declaration_lookup_field_index(stream_class->event_header_decl, - g_quark_from_static_string("id")); - if (len_index >= 0) { - struct definition_integer *defint; - struct definition *field; - - field = struct_definition_get_field_from_index(stream_class->event_header, len_index); - assert(field->declaration->id == CTF_TYPE_INTEGER); - defint = container_of(field, struct definition_integer, p); - assert(defint->declaration->signedness == FALSE); - id = defint->value._unsigned; /* set id */ - } - } + int dom_print = 0; + + 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 (pos->print_names) - fprintf(pos->fp, "timestamp = "); - else - fprintf(pos->fp, "["); - fprintf(pos->fp, "%12" PRIu64, stream->timestamp); - if (!pos->print_names) - fprintf(pos->fp, "]"); + if (stream->has_timestamp) { + 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); + if (!pos->print_names) + fprintf(pos->fp, "]"); - if (pos->print_names) - fprintf(pos->fp, ", "); - else + if (pos->print_names) + fprintf(pos->fp, ", "); + else + fprintf(pos->fp, " "); + } + 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)); if (pos->print_names) - field_nr++; + pos->field_nr++; else - fprintf(pos->fp, ": "); + 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 (field_nr++ != 0) - fprintf(pos->fp, ", "); + 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 = "); - ret = generic_rw(ppos, &stream_class->event_header->p); + fprintf(pos->fp, " stream.event.header ="); + field_nr_saved = pos->field_nr; + pos->field_nr = 0; + 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 (field_nr++ != 0) - fprintf(pos->fp, ", "); + 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 = "); - ret = generic_rw(ppos, &stream_class->event_context->p); + fprintf(pos->fp, " stream.event.context ="); + field_nr_saved = pos->field_nr; + pos->field_nr = 0; + 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 (field_nr++ != 0) - fprintf(pos->fp, ", "); + 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 = "); - ret = generic_rw(ppos, &event_class->context->p); + fprintf(pos->fp, " event.context ="); + field_nr_saved = pos->field_nr; + pos->field_nr = 0; + 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 (field_nr++ != 0) - fprintf(pos->fp, ", "); + 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 = "); - ret = generic_rw(ppos, &event_class->fields->p); + fprintf(pos->fp, " event.fields ="); + field_nr_saved = pos->field_nr; + pos->field_nr = 0; + 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; } + /* newline */ fprintf(pos->fp, "\n"); + pos->field_nr = 0; return 0; @@ -166,7 +362,10 @@ 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; @@ -184,7 +383,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: