Add missing libadd

[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 ceca3e4ea6c2b579bd63f44e3f992a5a3052cb9b..9c44958996deca5503c701601e5355b86f3ce9a3 100644 (file)
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -55,10 +55,12 @@ 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;
        uint64_t id = 0;
        int len_index;
@@ -91,49 +93,86 @@ int ctf_text_write_event(struct stream_pos *ppos,
                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 (stream_class->event_header) {
+       if (pos->print_names)
+               pos->field_nr++;
+       else
+               fprintf(pos->fp, ":");
+
+       /* Only show the event header in verbose mode */
+       if (babeltrace_verbose && stream_class->event_header) {
+               if (pos->field_nr++ != 0)
+                       fprintf(pos->fp, ",");
                if (pos->print_names)
-                       fprintf(pos->fp, ", stream.event.header =");
-               fprintf(pos->fp, " ");
+                       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 (pos->field_nr++ != 0)
+                       fprintf(pos->fp, ",");
                if (pos->print_names)
-                       fprintf(pos->fp, ", stream.event.context =");
-               fprintf(pos->fp, " ");
+                       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 (pos->field_nr++ != 0)
+                       fprintf(pos->fp, ",");
                if (pos->print_names)
-                       fprintf(pos->fp, ", event.context =");
-               fprintf(pos->fp, " ");
+                       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 (pos->field_nr++ != 0)
+                       fprintf(pos->fp, ",");
                if (pos->print_names)
-                       fprintf(pos->fp, ", event.fields =");
-               fprintf(pos->fp, " ");
+                       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;
 
@@ -161,7 +200,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 = 1;
+               pos->print_names = opt_field_names;
                break;
        case O_RDONLY:
        default: