X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf-text%2Fctf-text.c;h=4cb4297e1363bc32afc29231cd47685be39eab83;hb=3a25e036c64003c5778538d7cfef8beccc65d640;hp=273c9b72426145fd88400cde874c6c026ee789bc;hpb=43e34335c78d923564d369e9af46b634ce9ad55f;p=babeltrace.git

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index 273c9b72..4cb4297e 100644
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -211,15 +211,15 @@ const char *print_loglevel(int value)
 }
 
 static
-int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream *stream)
+int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *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_stream_declaration *stream_class = stream->stream_class;
 	int field_nr_saved;
-	struct ctf_event *event_class;
-	struct ctf_stream_event *event;
+	struct ctf_event_declaration *event_class;
+	struct ctf_event_definition *event;
 	uint64_t id;
 	int ret;
 	int dom_print = 0;
@@ -236,20 +236,20 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream *stream)
 		return -EINVAL;
 	}
 	event_class = g_ptr_array_index(stream_class->events_by_id, id);
-	if (!event) {
-		fprintf(stderr, "[error] Event id %" PRIu64 " is unknown.\n", id);
+	if (!event_class) {
+		fprintf(stderr, "[error] Event class id %" PRIu64 " is unknown.\n", id);
 		return -EINVAL;
 	}
 
 	/* Print events discarded */
 	if (stream->events_discarded) {
 		fflush(pos->fp);
-		fprintf(stderr, "[warning] Tracer discarded %d events between [",
+		fprintf(stderr, "[warning] Tracer discarded %" PRIu64 " events between [",
 			stream->events_discarded);
 		ctf_print_timestamp(stderr, stream, stream->prev_timestamp);
 		fprintf(stderr, "] and [");
 		ctf_print_timestamp(stderr, stream, stream->prev_timestamp_end);
-		fprintf(stderr, "]. You should consider increasing the buffer size.\n");
+		fprintf(stderr, "]. You should consider recording a new trace with larger buffers or with fewer events enabled.\n");
 		fflush(stderr);
 		stream->events_discarded = 0;
 	}
@@ -448,7 +448,6 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream *stream)
 	/* newline */
 	fprintf(pos->fp, "\n");
 	pos->field_nr = 0;
-	stream->consumed = 1;
 
 	return 0;