Update pretty-printing output

[babeltrace.git] / formats / ctf-text / ctf-text.c

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index 423cb10fe07da22eac99b4d113c2731aebbd777c..882e0620eed83159510f844d9c1d5ed4e34fccff 100644 (file)
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -55,14 +55,16 @@ 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;
        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) {
@@ -91,16 +93,32 @@ int ctf_text_write_event(struct stream_pos *ppos,
                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 (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 (stream_class->event_header) {
+       if (pos->print_names)
+               field_nr++;
+       else
+               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->print_names)
-                       fprintf(pos->fp, ", stream.event.header =");
-               else
-                       fprintf(pos->fp, ",");
-               fprintf(pos->fp, " ");
+                       fprintf(pos->fp, "stream.event.header = ");
                ret = generic_rw(ppos, &stream_class->event_header->p);
                if (ret)
                        goto error;
@@ -108,11 +126,10 @@ int ctf_text_write_event(struct stream_pos *ppos,
 
        /* print stream-declared event context */
        if (stream_class->event_context) {
+               if (field_nr++ != 0)
+                       fprintf(pos->fp, ", ");
                if (pos->print_names)
-                       fprintf(pos->fp, ", stream.event.context =");
-               else
-                       fprintf(pos->fp, ",");
-               fprintf(pos->fp, " ");
+                       fprintf(pos->fp, "stream.event.context = ");
                ret = generic_rw(ppos, &stream_class->event_context->p);
                if (ret)
                        goto error;
@@ -120,11 +137,10 @@ int ctf_text_write_event(struct stream_pos *ppos,
 
        /* print event-declared event context */
        if (event_class->context) {
+               if (field_nr++ != 0)
+                       fprintf(pos->fp, ", ");
                if (pos->print_names)
-                       fprintf(pos->fp, ", event.context =");
-               else
-                       fprintf(pos->fp, ",");
-               fprintf(pos->fp, " ");
+                       fprintf(pos->fp, "event.context = ");
                ret = generic_rw(ppos, &event_class->context->p);
                if (ret)
                        goto error;
@@ -132,11 +148,10 @@ int ctf_text_write_event(struct stream_pos *ppos,
 
        /* Read and print event payload */
        if (event_class->fields) {
+               if (field_nr++ != 0)
+                       fprintf(pos->fp, ", ");
                if (pos->print_names)
-                       fprintf(pos->fp, ", event.fields =");
-               else
-                       fprintf(pos->fp, ",");
-               fprintf(pos->fp, " ");
+                       fprintf(pos->fp, "event.fields = ");
                ret = generic_rw(ppos, &event_class->fields->p);
                if (ret)
                        goto error;