X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=137c11ec57033660565f0e458671bcd3ea01666b;hb=104147cd176d0b6f635777f34a7df15a33a45c15;hp=5a5149572f76fd3cf2210766700a98a28575e482;hpb=0d69b916c5ba44b63a26aa038d416d6ee286306b;p=babeltrace.git

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 5a514957..137c11ec 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -391,6 +391,49 @@ void ctf_print_timestamp(FILE *fp,
 	}
 }
 
+static
+void print_uuid(FILE *fp, unsigned char *uuid)
+{
+	int i;
+
+	for (i = 0; i < BABELTRACE_UUID_LEN; i++)
+		fprintf(fp, "%x", (unsigned int) uuid[i]);
+}
+
+void ctf_print_discarded(FILE *fp, struct ctf_stream_definition *stream,
+		int end_stream)
+{
+	fprintf(fp, "[warning] Tracer discarded %" PRIu64 " events %sbetween [",
+		stream->events_discarded,
+		end_stream ? "at end of stream " : "");
+	if (opt_clock_cycles) {
+		ctf_print_timestamp(fp, stream,
+				stream->prev_cycles_timestamp);
+		fprintf(fp, "] and [");
+		ctf_print_timestamp(fp, stream,
+				stream->prev_cycles_timestamp_end);
+	} else {
+		ctf_print_timestamp(fp, stream,
+				stream->prev_real_timestamp);
+		fprintf(fp, "] and [");
+		ctf_print_timestamp(fp, stream,
+				stream->prev_real_timestamp_end);
+	}
+	fprintf(fp, "] in trace UUID ");
+	print_uuid(fp, stream->stream_class->trace->uuid);
+	if (stream->stream_class->trace->path[0])
+		fprintf(fp, ", at path: \"%s\"",
+			stream->stream_class->trace->path);
+
+	fprintf(fp, ", within stream id %" PRIu64, stream->stream_id);
+	if (stream->path[0])
+		fprintf(fp, ", at relative path: \"%s\"", stream->path);
+	fprintf(fp, ". ");
+	fprintf(fp, "You should consider recording a new trace with larger "
+		"buffers or with fewer events enabled.\n");
+	fflush(fp);
+}
+
 static
 int ctf_read_event(struct bt_stream_pos *ppos, struct ctf_stream_definition *stream)
 {
@@ -725,43 +768,26 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence)
 		}
 		if (pos->cur_index >= pos->packet_real_index->len) {
 			/*
-			 * When a stream reaches the end of the
-			 * file, we need to show the number of
-			 * events discarded ourselves, because
-			 * there is no next event scheduled to
-			 * be printed in the output.
+			 * We need to check if we are in trace read or
+			 * called from packet indexing.  In this last
+			 * case, the collection is not there, so we
+			 * cannot print the timestamps.
 			 */
-			if (file_stream->parent.events_discarded) {
+			if ((&file_stream->parent)->stream_class->trace->collection) {
 				/*
-				 * We need to check if we are in trace
-				 * read or called from packet indexing.
-				 * In this last case, the collection is
-				 * not there, so we cannot print the
-				 * timestamps.
+				 * When a stream reaches the end of the
+				 * file, we need to show the number of
+				 * events discarded ourselves, because
+				 * there is no next event scheduled to
+				 * be printed in the output.
 				 */
-				if ((&file_stream->parent)->stream_class->trace->collection) {
+				if (file_stream->parent.events_discarded) {
 					fflush(stdout);
-					fprintf(stderr, "[warning] Tracer discarded %" PRIu64 " events at end of stream between [",
-							file_stream->parent.events_discarded);
-					if (opt_clock_cycles) {
-						ctf_print_timestamp(stderr,
-								&file_stream->parent,
-								file_stream->parent.prev_cycles_timestamp);
-						fprintf(stderr, "] and [");
-						ctf_print_timestamp(stderr, &file_stream->parent,
-								file_stream->parent.prev_cycles_timestamp_end);
-					} else {
-						ctf_print_timestamp(stderr,
-								&file_stream->parent,
-								file_stream->parent.prev_real_timestamp);
-						fprintf(stderr, "] and [");
-						ctf_print_timestamp(stderr, &file_stream->parent,
-								file_stream->parent.prev_real_timestamp_end);
-					}
-					fprintf(stderr, "]. You should consider recording a new trace with larger buffers or with fewer events enabled.\n");
-					fflush(stderr);
+					ctf_print_discarded(stderr,
+						&file_stream->parent,
+						1);
+					file_stream->parent.events_discarded = 0;
 				}
-				file_stream->parent.events_discarded = 0;
 			}
 			pos->offset = EOF;
 			return;
@@ -1372,7 +1398,9 @@ int create_stream_packet_index(struct ctf_trace *td,
 		}
 
 		if (!first_packet && file_stream->parent.stream_id != stream_id) {
-			fprintf(stderr, "[error] Stream ID is changing within a stream.\n");
+			fprintf(stderr, "[error] Stream ID is changing within a stream: expecting %" PRIu64 ", but packet has %" PRIu64 "\n",
+				stream_id,
+				file_stream->parent.stream_id);
 			return -EINVAL;
 		}
 		if (first_packet) {
@@ -1552,6 +1580,9 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags,
 	file_stream = g_new0(struct ctf_file_stream, 1);
 	file_stream->pos.last_offset = LAST_OFFSET_POISON;
 
+	strncpy(file_stream->parent.path, path, PATH_MAX);
+	file_stream->parent.path[PATH_MAX - 1] = '\0';
+
 	if (packet_seek) {
 		file_stream->pos.packet_seek = packet_seek;
 	} else {