X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=formats%2Fctf-text%2Fctf-text.c;h=81dbb3eb159ef0b423ea09696c086726ce5272f7;hb=5b80ddfb8dfa4db544efddcd8acaed1228f87daa;hp=9ad23012d9512cc2fe4c79e8cc999a8a1850ada1;hpb=82662ad4362f791f9cd7026652f60708923554f4;p=babeltrace.git

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index 9ad23012..81dbb3eb 100644
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -34,12 +34,20 @@
 #include <unistd.h>
 #include <stdlib.h>
 
+#define NSEC_PER_SEC 1000000000ULL
+
 int opt_all_field_names,
 	opt_scope_field_names,
 	opt_header_field_names,
 	opt_context_field_names,
 	opt_payload_field_names,
-	opt_trace_name;
+	opt_all_fields,
+	opt_trace_field,
+	opt_trace_domain_field,
+	opt_trace_procname_field,
+	opt_trace_vpid_field,
+	opt_loglevel_field,
+	opt_delta_field = 1;
 
 enum field_item {
 	ITEM_SCOPE,
@@ -154,31 +162,45 @@ int ctf_text_write_event(struct stream_pos *ppos,
 	struct ctf_stream_event *event;
 	uint64_t id;
 	int ret;
+	int dom_print = 0;
 
 	id = stream->event_id;
 
 	if (id >= stream_class->events_by_id->len) {
-		fprintf(stdout, "[error] Event id %" PRIu64 " is outside range.\n", id);
+		fprintf(stderr, "[error] Event id %" PRIu64 " is outside range.\n", id);
 		return -EINVAL;
 	}
 	event = g_ptr_array_index(stream->events_by_id, id);
 	if (!event) {
-		fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id);
+		fprintf(stderr, "[error] Event id %" PRIu64 " is unknown.\n", id);
 		return -EINVAL;
 	}
 	event_class = g_ptr_array_index(stream_class->events_by_id, id);
 	if (!event) {
-		fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id);
+		fprintf(stderr, "[error] Event 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 [",
+			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");
+		fflush(stderr);
+		stream->events_discarded = 0;
+	}
+
 	if (stream->has_timestamp) {
 		set_field_names_print(pos, ITEM_HEADER);
 		if (pos->print_names)
 			fprintf(pos->fp, "timestamp = ");
 		else
 			fprintf(pos->fp, "[");
-		fprintf(pos->fp, "%12" PRIu64, stream->timestamp);
+		ctf_print_timestamp(pos->fp, stream, stream->timestamp);
 		if (!pos->print_names)
 			fprintf(pos->fp, "]");
 
@@ -187,18 +209,93 @@ int ctf_text_write_event(struct stream_pos *ppos,
 		else
 			fprintf(pos->fp, " ");
 	}
-	if ((opt_trace_name || opt_all_field_names) && stream_class->trace->path[0] != '\0') {
+	if ((opt_delta_field || opt_all_fields) && stream->has_timestamp) {
+		uint64_t delta, delta_sec, delta_nsec;
+
 		set_field_names_print(pos, ITEM_HEADER);
 		if (pos->print_names)
-			fprintf(pos->fp, "trace = ");
+			fprintf(pos->fp, "delta = ");
+		else
+			fprintf(pos->fp, "(");
+		if (pos->last_timestamp != -1ULL) {
+			delta = stream->timestamp - pos->last_timestamp;
+			delta_sec = delta / NSEC_PER_SEC;
+			delta_nsec = delta % NSEC_PER_SEC;
+			fprintf(pos->fp, "+%" PRIu64 ".%09" PRIu64,
+				delta_sec, delta_nsec);
+		} else {
+			fprintf(pos->fp, "+?.?????????");
+		}
+		if (!pos->print_names)
+			fprintf(pos->fp, ")");
 
-		fprintf(pos->fp, "%s", stream_class->trace->path);
+		if (pos->print_names)
+			fprintf(pos->fp, ", ");
+		else
+			fprintf(pos->fp, " ");
+		pos->last_timestamp = stream->timestamp;
+	}
 
+	if ((opt_trace_field || opt_all_fields) && stream_class->trace->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);
 		if (pos->print_names)
 			fprintf(pos->fp, ", ");
 		else
 			fprintf(pos->fp, " ");
 	}
+	if ((opt_trace_domain_field && !opt_all_fields) && stream_class->trace->env.domain[0] != '\0') {
+		set_field_names_print(pos, ITEM_HEADER);
+		if (pos->print_names) {
+			fprintf(pos->fp, "trace:domain = ");
+		}
+		fprintf(pos->fp, "%s", stream_class->trace->env.domain);
+		if (pos->print_names)
+			fprintf(pos->fp, ", ");
+		dom_print = 1;
+	}
+	if ((opt_trace_procname_field && !opt_all_fields) && stream_class->trace->env.procname[0] != '\0') {
+		set_field_names_print(pos, ITEM_HEADER);
+		if (pos->print_names) {
+			fprintf(pos->fp, "trace:procname = ");
+		} else if (dom_print) {
+			fprintf(pos->fp, ":");
+		}
+		fprintf(pos->fp, "%s", stream_class->trace->env.procname);
+		if (pos->print_names)
+			fprintf(pos->fp, ", ");
+		dom_print = 1;
+	}
+	if ((opt_trace_vpid_field && !opt_all_fields) && stream_class->trace->env.vpid != -1) {
+		set_field_names_print(pos, ITEM_HEADER);
+		if (pos->print_names) {
+			fprintf(pos->fp, "trace:vpid = ");
+		} else if (dom_print) {
+			fprintf(pos->fp, ":");
+		}
+		fprintf(pos->fp, "%d", stream_class->trace->env.vpid);
+		if (pos->print_names)
+			fprintf(pos->fp, ", ");
+		dom_print = 1;
+	}
+	if ((opt_loglevel_field || opt_all_fields) && event_class->loglevel != -1) {
+		set_field_names_print(pos, ITEM_HEADER);
+		if (pos->print_names) {
+			fprintf(pos->fp, "loglevel = ");
+		} else if (dom_print) {
+			fprintf(pos->fp, ":");
+		}
+		fprintf(pos->fp, "(%d)",
+			event_class->loglevel);
+		if (pos->print_names)
+			fprintf(pos->fp, ", ");
+		dom_print = 1;
+	}
+	if (dom_print && !pos->print_names)
+		fprintf(pos->fp, " ");
 	set_field_names_print(pos, ITEM_HEADER);
 	if (pos->print_names)
 		fprintf(pos->fp, "name = ");
@@ -294,7 +391,7 @@ int ctf_text_write_event(struct stream_pos *ppos,
 	return 0;
 
 error:
-	fprintf(stdout, "[error] Unexpected end of stream. Either the trace data stream is corrupted or metadata description does not match data layout.\n");
+	fprintf(stderr, "[error] Unexpected end of stream. Either the trace data stream is corrupted or metadata description does not match data layout.\n");
 	return ret;
 }
 
@@ -308,6 +405,7 @@ struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
 
 	pos = g_new0(struct ctf_text_stream_pos, 1);
 
+	pos->last_timestamp = -1ULL;
 	switch (flags & O_ACCMODE) {
 	case O_RDWR:
 		if (!path)
@@ -323,7 +421,7 @@ struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
 		break;
 	case O_RDONLY:
 	default:
-		fprintf(stdout, "[error] Incorrect open flags.\n");
+		fprintf(stderr, "[error] Incorrect open flags.\n");
 		goto error;
 	}