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

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index 55158caa..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 {
@@ -322,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 = ");
@@ -332,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 = ");
@@ -344,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 = ");
@@ -370,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);