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;
int ret;
- int field_nr = 0;
/* print event header */
if (stream_class->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_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;
+ }
}
}
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->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, ", ");
+ 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)
- field_nr++;
+ pos->field_nr++;
else
- fprintf(pos->fp, ": ");
+ fprintf(pos->fp, ":");
/* Only show the event header in verbose mode */
if (babeltrace_verbose && stream_class->event_header) {
- if (field_nr++ != 0)
- fprintf(pos->fp, ", ");
+ if (pos->field_nr++ != 0)
+ fprintf(pos->fp, ",");
if (pos->print_names)
- fprintf(pos->fp, "stream.event.header = ");
+ 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);
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 (pos->field_nr++ != 0)
+ fprintf(pos->fp, ",");
if (pos->print_names)
- fprintf(pos->fp, "stream.event.context = ");
+ 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);
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 (pos->field_nr++ != 0)
+ fprintf(pos->fp, ",");
if (pos->print_names)
- fprintf(pos->fp, "event.context = ");
+ fprintf(pos->fp, " event.context =");
+ field_nr_saved = pos->field_nr;
+ pos->field_nr = 0;
ret = generic_rw(ppos, &event_class->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 (pos->field_nr++ != 0)
+ fprintf(pos->fp, ",");
if (pos->print_names)
- fprintf(pos->fp, "event.fields = ");
+ fprintf(pos->fp, " event.fields =");
+ field_nr_saved = pos->field_nr;
+ pos->field_nr = 0;
ret = generic_rw(ppos, &event_class->fields->p);
if (ret)
goto error;
+ pos->field_nr = field_nr_saved;
}
+ /* newline */
fprintf(pos->fp, "\n");
+ pos->field_nr = 0;
return 0;