X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Fctf-text.c;h=70e0e92ab6604a7535724b520808247b7dc43489;hp=2ec71c56765b872a30c2ab040f865356227d75a6;hb=596dd032fb31985bd7856efcd6ee3dc133479cec;hpb=aa6bffaea450106c60fc1292152bd94a270fd243

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index 2ec71c56..70e0e92a 100644
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -55,15 +55,16 @@ struct format ctf_text_format = {
 
 static
 int ctf_text_write_event(struct stream_pos *ppos,
-			 struct ctf_stream_class *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;
 	int ret;
-	int field_nr = 0;
 
 	/* print event header */
 	if (stream_class->event_header) {
@@ -92,68 +93,84 @@ int ctf_text_write_event(struct stream_pos *ppos,
 		return -EINVAL;
 	}
 
-	if (field_nr++ != 0)
-		fprintf(pos->fp, ", ");
 	if (pos->print_names)
 		fprintf(pos->fp, "timestamp = ");
 	else
 		fprintf(pos->fp, "[");
-	fprintf(pos->fp, "%" PRIu64, (uint64_t) 0);	/* TODO */
+	fprintf(pos->fp, "%12" PRIu64, stream->timestamp);
 	if (!pos->print_names)
 		fprintf(pos->fp, "]");
 
-	if (field_nr++ != 0)
+	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));
+	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) {
-		if (field_nr++ != 0)
-			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, " 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, " ");
+			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, " ");
+			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, " ");
+			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;