X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Ftext%2Fdetails%2Fwrite.c;h=394c63fd491da3fb67ff2adf5ef492befad2ca50;hb=cc413248eefb5938459338ea1c543d0e03a339fc;hp=aa45d3d08e746abbd8ba5d59225be8d11363246a;hpb=54d785facc63ded43f23e60b8acb46250d82cfbe;p=babeltrace.git

diff --git a/src/plugins/text/details/write.c b/src/plugins/text/details/write.c
index aa45d3d0..394c63fd 100644
--- a/src/plugins/text/details/write.c
+++ b/src/plugins/text/details/write.c
@@ -1596,7 +1596,6 @@ int try_write_meta(struct details_write_ctx *ctx, const bt_trace_class *tc,
 		 * rewrite `sc`.
 		 */
 		write_trace_class(ctx, tc);
-		write_nl(ctx);
 
 		/*
 		 * Mark this trace class as written, as well as all
@@ -1648,7 +1647,6 @@ int try_write_meta(struct details_write_ctx *ctx, const bt_trace_class *tc,
 		 * classes, so we don't need to rewrite `ec`.
 		 */
 		write_stream_class(ctx, sc);
-		write_nl(ctx);
 
 		/*
 		 * Mark this stream class as written, as well as all its
@@ -1681,7 +1679,6 @@ int try_write_meta(struct details_write_ctx *ctx, const bt_trace_class *tc,
 		}
 
 		write_event_class(ctx, ec);
-		write_nl(ctx);
 		details_did_write_meta_object(ctx, tc, ec);
 		goto end;
 	}
@@ -1982,6 +1979,18 @@ int write_event_message(struct details_write_ctx *ctx,
 		goto end;
 	}
 
+	if (!ctx->details_comp->cfg.with_data) {
+		goto end;
+	}
+
+	if (ctx->str->len > 0) {
+		/*
+		 * Output buffer contains metadata: separate blocks with
+		 * newline.
+		 */
+		write_nl(ctx);
+	}
+
 	/* Write time */
 	if (bt_stream_class_borrow_default_clock_class_const(sc)) {
 		write_time(ctx,
@@ -2038,7 +2047,6 @@ int write_event_message(struct details_write_ctx *ctx,
 	decr_indent(ctx);
 
 end:
-
 	return ret;
 }
 
@@ -2219,6 +2227,18 @@ int write_stream_beginning_message(struct details_write_ctx *ctx,
 		goto end;
 	}
 
+	if (!ctx->details_comp->cfg.with_data) {
+		goto end;
+	}
+
+	if (ctx->str->len > 0) {
+		/*
+		 * Output buffer contains metadata: separate blocks with
+		 * newline.
+		 */
+		write_nl(ctx);
+	}
+
 	/* Write time */
 	if (cc) {
 		const bt_clock_snapshot *cs;
@@ -2282,6 +2302,10 @@ int write_stream_end_message(struct details_write_ctx *ctx,
 	const bt_clock_class *cc =
 		bt_stream_class_borrow_default_clock_class_const(sc);
 
+	if (!ctx->details_comp->cfg.with_data) {
+		goto end;
+	}
+
 	/* Write time */
 	if (cc) {
 		const bt_clock_snapshot *cs;
@@ -2319,6 +2343,10 @@ int write_packet_beginning_message(struct details_write_ctx *ctx,
 	const bt_stream_class *sc = bt_stream_borrow_class_const(stream);
 	const bt_field *field;
 
+	if (!ctx->details_comp->cfg.with_data) {
+		goto end;
+	}
+
 	/* Write time */
 	if (bt_stream_class_packets_have_beginning_default_clock_snapshot(sc)) {
 		write_time(ctx,
@@ -2396,6 +2424,7 @@ static
 int write_discarded_events_message(struct details_write_ctx *ctx,
 		const bt_message *msg)
 {
+	int ret = 0;
 	const bt_stream *stream = bt_message_discarded_events_borrow_stream_const(
 		msg);
 	const bt_stream_class *sc = bt_stream_borrow_class_const(stream);
@@ -2403,6 +2432,10 @@ int write_discarded_events_message(struct details_write_ctx *ctx,
 	const bt_clock_snapshot *end_cs = NULL;
 	uint64_t count;
 
+	if (!ctx->details_comp->cfg.with_data) {
+		goto end;
+	}
+
 	if (bt_stream_class_discarded_events_have_default_clock_snapshots(sc)) {
 		beginning_cs =
 			bt_message_discarded_events_borrow_beginning_default_clock_snapshot_const(
@@ -2417,14 +2450,18 @@ int write_discarded_events_message(struct details_write_ctx *ctx,
 		count = UINT64_C(-1);
 	}
 
-	return write_discarded_items_message(ctx, "events", stream,
+	ret = write_discarded_items_message(ctx, "events", stream,
 		beginning_cs, end_cs, count);
+
+end:
+	return ret;
 }
 
 static
 int write_discarded_packets_message(struct details_write_ctx *ctx,
 		const bt_message *msg)
 {
+	int ret = 0;
 	const bt_stream *stream = bt_message_discarded_packets_borrow_stream_const(
 		msg);
 	const bt_stream_class *sc = bt_stream_borrow_class_const(stream);
@@ -2432,6 +2469,10 @@ int write_discarded_packets_message(struct details_write_ctx *ctx,
 	const bt_clock_snapshot *end_cs = NULL;
 	uint64_t count;
 
+	if (!ctx->details_comp->cfg.with_data) {
+		goto end;
+	}
+
 	if (bt_stream_class_discarded_packets_have_default_clock_snapshots(sc)) {
 		beginning_cs =
 			bt_message_discarded_packets_borrow_beginning_default_clock_snapshot_const(
@@ -2446,8 +2487,11 @@ int write_discarded_packets_message(struct details_write_ctx *ctx,
 		count = UINT64_C(-1);
 	}
 
-	return write_discarded_items_message(ctx, "packets", stream,
+	ret = write_discarded_items_message(ctx, "packets", stream,
 		beginning_cs, end_cs, count);
+
+end:
+	return ret;
 }
 
 static
@@ -2460,6 +2504,10 @@ int write_packet_end_message(struct details_write_ctx *ctx,
 	const bt_stream *stream = bt_packet_borrow_stream_const(packet);
 	const bt_stream_class *sc = bt_stream_borrow_class_const(stream);
 
+	if (!ctx->details_comp->cfg.with_data) {
+		goto end;
+	}
+
 	/* Write time */
 	if (bt_stream_class_packets_have_end_default_clock_snapshot(sc)) {
 		write_time(ctx,
@@ -2528,10 +2576,6 @@ int details_write_message(struct details_comp *details_comp,
 	/* Reset output buffer */
 	g_string_assign(details_comp->str, "");
 
-	if (details_comp->printed_something && !details_comp->cfg.compact) {
-		write_nl(&ctx);
-	}
-
 	switch (bt_message_get_type(msg)) {
 	case BT_MESSAGE_TYPE_EVENT:
 		ret = write_event_message(&ctx, msg);
@@ -2561,5 +2605,17 @@ int details_write_message(struct details_comp *details_comp,
 		abort();
 	}
 
+	/*
+	 * If this component printed at least one character so far, and
+	 * we're not in compact mode, and there's something in the
+	 * output buffer for this message, then prepend a newline to the
+	 * output buffer to visually separate message blocks.
+	 */
+	if (details_comp->printed_something && !details_comp->cfg.compact &&
+			details_comp->str->len > 0) {
+		/* TODO: Optimize this */
+		g_string_prepend_c(details_comp->str, '\n');
+	}
+
 	return ret;
 }