X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf-text%2Fctf-text.c;h=e23bb9e2c4093ab2ca45029bd7046c02c642ed94;hb=9b3c1d6f8e01603488e317ffef7a8e3c15c98459;hp=1d29390c7a1c5a5ed034c31cd0965b728704ca4d;hpb=a0b34fbba498a8a447357adf5920ac2c8a22f026;p=babeltrace.git

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index 1d29390c..e23bb9e2 100644
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -46,7 +46,10 @@ int opt_all_field_names,
 	opt_trace_domain_field,
 	opt_trace_procname_field,
 	opt_trace_vpid_field,
+	opt_trace_hostname_field,
+	opt_trace_default_fields = 1,
 	opt_loglevel_field,
+	opt_emf_field,
 	opt_delta_field = 1;
 
 enum field_item {
@@ -244,11 +247,21 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *
 	/* 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);
+		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;
@@ -260,7 +273,11 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *
 			fprintf(pos->fp, "timestamp = ");
 		else
 			fprintf(pos->fp, "[");
-		ctf_print_timestamp(pos->fp, stream, stream->timestamp);
+		if (opt_clock_cycles) {
+			ctf_print_timestamp(pos->fp, stream, stream->cycles_timestamp);
+		} else {
+			ctf_print_timestamp(pos->fp, stream, stream->real_timestamp);
+		}
 		if (!pos->print_names)
 			fprintf(pos->fp, "]");
 
@@ -277,8 +294,8 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *
 			fprintf(pos->fp, "delta = ");
 		else
 			fprintf(pos->fp, "(");
-		if (pos->last_timestamp != -1ULL) {
-			delta = stream->timestamp - pos->last_timestamp;
+		if (pos->last_real_timestamp != -1ULL) {
+			delta = stream->real_timestamp - pos->last_real_timestamp;
 			delta_sec = delta / NSEC_PER_SEC;
 			delta_nsec = delta % NSEC_PER_SEC;
 			fprintf(pos->fp, "+%" PRIu64 ".%09" PRIu64,
@@ -293,7 +310,8 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *
 			fprintf(pos->fp, ", ");
 		else
 			fprintf(pos->fp, " ");
-		pos->last_timestamp = stream->timestamp;
+		pos->last_real_timestamp = stream->real_timestamp;
+		pos->last_cycles_timestamp = stream->cycles_timestamp;
 	}
 
 	if ((opt_trace_field || opt_all_fields) && stream_class->trace->path[0] != '\0') {
@@ -307,7 +325,18 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *
 		else
 			fprintf(pos->fp, " ");
 	}
-	if ((opt_trace_domain_field && !opt_all_fields) && stream_class->trace->env.domain[0] != '\0') {
+	if ((opt_trace_hostname_field || opt_all_fields || opt_trace_default_fields)
+			&& stream_class->trace->env.hostname[0] != '\0') {
+		set_field_names_print(pos, ITEM_HEADER);
+		if (pos->print_names) {
+			fprintf(pos->fp, "trace:hostname = ");
+		}
+		fprintf(pos->fp, "%s", stream_class->trace->env.hostname);
+		if (pos->print_names)
+			fprintf(pos->fp, ", ");
+		dom_print = 1;
+	}
+	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 = ");
@@ -317,7 +346,8 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *
 			fprintf(pos->fp, ", ");
 		dom_print = 1;
 	}
-	if ((opt_trace_procname_field && !opt_all_fields) && stream_class->trace->env.procname[0] != '\0') {
+	if ((opt_trace_procname_field || opt_all_fields || opt_trace_default_fields)
+			&& stream_class->trace->env.procname[0] != '\0') {
 		set_field_names_print(pos, ITEM_HEADER);
 		if (pos->print_names) {
 			fprintf(pos->fp, "trace:procname = ");
@@ -329,7 +359,8 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *
 			fprintf(pos->fp, ", ");
 		dom_print = 1;
 	}
-	if ((opt_trace_vpid_field && !opt_all_fields) && stream_class->trace->env.vpid != -1) {
+	if ((opt_trace_vpid_field || opt_all_fields || opt_trace_default_fields)
+			&& stream_class->trace->env.vpid != -1) {
 		set_field_names_print(pos, ITEM_HEADER);
 		if (pos->print_names) {
 			fprintf(pos->fp, "trace:vpid = ");
@@ -355,6 +386,19 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *
 			fprintf(pos->fp, ", ");
 		dom_print = 1;
 	}
+	if ((opt_emf_field || opt_all_fields) && event_class->model_emf_uri) {
+		set_field_names_print(pos, ITEM_HEADER);
+		if (pos->print_names) {
+			fprintf(pos->fp, "model.emf.uri = ");
+		} else if (dom_print) {
+			fprintf(pos->fp, ":");
+		}
+		fprintf(pos->fp, "\"%s\"",
+			g_quark_to_string(event_class->model_emf_uri));
+		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);
@@ -448,7 +492,6 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *
 	/* newline */
 	fprintf(pos->fp, "\n");
 	pos->field_nr = 0;
-	stream->consumed = 1;
 
 	return 0;
 
@@ -467,7 +510,8 @@ 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;
+	pos->last_real_timestamp = -1ULL;
+	pos->last_cycles_timestamp = -1ULL;
 	switch (flags & O_ACCMODE) {
 	case O_RDWR:
 		if (!path)