X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Fctf-text.c;h=9d5123a1fdb5a43c19c4ee0d425f07810eb07524;hp=e9fd74180dcd9594d7a5a07b35ef6207c67e7ebb;hb=2654fe9bab8f0eaeb17264ef7abadfd14e245b23;hpb=0d69b916c5ba44b63a26aa038d416d6ee286306b

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index e9fd7418..9d5123a1 100644
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -262,29 +262,6 @@ int ctf_text_write_event(struct bt_stream_pos *ppos, struct ctf_stream_definitio
 		return -EINVAL;
 	}
 
-	/* Print events discarded */
-	if (stream->events_discarded) {
-		fflush(pos->fp);
-		fprintf(stderr, "[warning] Tracer discarded %" PRIu64 " events between [",
-			stream->events_discarded);
-		if (opt_clock_cycles) {
-			ctf_print_timestamp(stderr, stream,
-					stream->prev_cycles_timestamp);
-			fprintf(stderr, "] and [");
-			ctf_print_timestamp(stderr, stream,
-					stream->prev_cycles_timestamp_end);
-		} else {
-			ctf_print_timestamp(stderr, stream,
-					stream->prev_real_timestamp);
-			fprintf(stderr, "] and [");
-			ctf_print_timestamp(stderr, stream,
-					stream->prev_real_timestamp_end);
-		}
-		fprintf(stderr, "]. You should consider recording a new trace with larger buffers or with fewer events enabled.\n");
-		fflush(stderr);
-		stream->events_discarded = 0;
-	}
-
 	if (stream->has_timestamp) {
 		set_field_names_print(pos, ITEM_HEADER);
 		if (pos->print_names)
@@ -304,7 +281,7 @@ int ctf_text_write_event(struct bt_stream_pos *ppos, struct ctf_stream_definitio
 		else
 			fprintf(pos->fp, " ");
 	}
-	if ((opt_delta_field || opt_all_fields) && stream->has_timestamp) {
+	if (opt_delta_field && stream->has_timestamp) {
 		uint64_t delta, delta_sec, delta_nsec;
 
 		set_field_names_print(pos, ITEM_HEADER);
@@ -332,12 +309,12 @@ int ctf_text_write_event(struct bt_stream_pos *ppos, struct ctf_stream_definitio
 		pos->last_cycles_timestamp = stream->cycles_timestamp;
 	}
 
-	if ((opt_trace_field || opt_all_fields) && stream_class->trace->path[0] != '\0') {
+	if ((opt_trace_field || opt_all_fields) && stream_class->trace->parent.path[0] != '\0') {
 		set_field_names_print(pos, ITEM_HEADER);
 		if (pos->print_names) {
 			fprintf(pos->fp, "trace = ");
 		}
-		fprintf(pos->fp, "%s", stream_class->trace->path);
+		fprintf(pos->fp, "%s", stream_class->trace->parent.path);
 		if (pos->print_names)
 			fprintf(pos->fp, ", ");
 		else
@@ -577,7 +554,9 @@ struct bt_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->parent.trace = &pos->trace_descriptor;
 		pos->print_names = 0;
+		babeltrace_ctf_console_output++;
 		break;
 	case O_RDONLY:
 	default:
@@ -597,10 +576,14 @@ int ctf_text_close_trace(struct bt_trace_descriptor *td)
 	int ret;
 	struct ctf_text_stream_pos *pos =
 		container_of(td, struct ctf_text_stream_pos, trace_descriptor);
-	ret = fclose(pos->fp);
-	if (ret) {
-		perror("Error on fclose");
-		return -1;
+
+	babeltrace_ctf_console_output--;
+	if (pos->fp != stdout) {
+		ret = fclose(pos->fp);
+		if (ret) {
+			perror("Error on fclose");
+			return -1;
+		}
 	}
 	g_free(pos);
 	return 0;