X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Fctf-text.c;h=0d551179710dafc368ed9059cbe2a40b62d5facf;hp=423cb10fe07da22eac99b4d113c2731aebbd777c;hb=e28d4618a97ed5c6da7cda25af9d1121808664cf;hpb=d63ca2cd2249356c28a63653d30c681e9a7ce249 diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c index 423cb10f..0d551179 100644 --- a/formats/ctf-text/ctf-text.c +++ b/formats/ctf-text/ctf-text.c @@ -55,29 +55,41 @@ struct format ctf_text_format = { static int ctf_text_write_event(struct stream_pos *ppos, - struct ctf_stream *stream_class) + struct ctf_stream *stream) { 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; + struct ctf_file_event *event; uint64_t id = 0; - int len_index; int ret; /* print event header */ - if (stream_class->event_header) { + if (stream->stream_event_header) { + struct definition_integer *integer_definition; + struct definition *variant; + /* 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 */ + integer_definition = lookup_integer(&stream->stream_event_header->p, "id", FALSE); + if (integer_definition) { + id = integer_definition->value._unsigned; + } else { + struct definition_enum *enum_definition; + + enum_definition = lookup_enum(&stream->stream_event_header->p, "id", FALSE); + if (enum_definition) { + id = enum_definition->integer->value._unsigned; + } + } + + variant = lookup_variant(&stream->stream_event_header->p, "v"); + if (variant) { + integer_definition = lookup_integer(variant, "id", FALSE); + if (integer_definition) { + id = integer_definition->value._unsigned; + } } } @@ -85,63 +97,111 @@ int ctf_text_write_event(struct stream_pos *ppos, 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 (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 + fprintf(pos->fp, " "); + } if (pos->print_names) fprintf(pos->fp, "name = "); fprintf(pos->fp, "%s", g_quark_to_string(event_class->name)); + if (pos->print_names) + pos->field_nr++; + else + fprintf(pos->fp, ":"); - if (stream_class->event_header) { + /* print cpuid field from packet context */ + if (stream->stream_packet_context) { + if (pos->field_nr++ != 0) + fprintf(pos->fp, ","); if (pos->print_names) - fprintf(pos->fp, ", stream.event.header ="); - else + fprintf(pos->fp, " stream.packet.context ="); + field_nr_saved = pos->field_nr; + pos->field_nr = 0; + 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->stream_event_header) { + if (pos->field_nr++ != 0) fprintf(pos->fp, ","); - fprintf(pos->fp, " "); - ret = generic_rw(ppos, &stream_class->event_header->p); + 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->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 (pos->print_names) - fprintf(pos->fp, ", stream.event.context ="); - else + if (stream->stream_event_context) { + if (pos->field_nr++ != 0) fprintf(pos->fp, ","); - fprintf(pos->fp, " "); - ret = generic_rw(ppos, &stream_class->event_context->p); + 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->stream_event_context->p); if (ret) goto error; + pos->field_nr = field_nr_saved; } /* print event-declared event context */ - if (event_class->context) { - if (pos->print_names) - fprintf(pos->fp, ", event.context ="); - else + if (event->event_context) { + if (pos->field_nr++ != 0) fprintf(pos->fp, ","); - fprintf(pos->fp, " "); - ret = generic_rw(ppos, &event_class->context->p); + if (pos->print_names) + fprintf(pos->fp, " event.context ="); + field_nr_saved = pos->field_nr; + pos->field_nr = 0; + 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 (pos->print_names) - fprintf(pos->fp, ", event.fields ="); - else + if (event->event_fields) { + if (pos->field_nr++ != 0) fprintf(pos->fp, ","); - fprintf(pos->fp, " "); - ret = generic_rw(ppos, &event_class->fields->p); + if (pos->print_names) + fprintf(pos->fp, " event.fields ="); + field_nr_saved = pos->field_nr; + pos->field_nr = 0; + 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;