X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf-text%2Fctf-text.c;h=4f46427be5ec38bb5fce23e4a905267486fa12a4;hb=f133896d405417ba90ac250d243d4b8e539e98f1;hp=d209eca23f99da6634d6c1680045d8a3bd14f79b;hpb=32cfb8adf760170061946d1f802677fb02f6dc96;p=babeltrace.git

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index d209eca2..4f46427b 100644
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -47,7 +47,10 @@ int opt_all_field_names,
 	opt_trace_procname_field,
 	opt_trace_vpid_field,
 	opt_trace_hostname_field,
+	opt_trace_default_fields = 1,
 	opt_loglevel_field,
+	opt_emf_field,
+	opt_callsite_field,
 	opt_delta_field = 1;
 
 enum field_item {
@@ -115,6 +118,14 @@ void __attribute__((constructor)) init_quarks(void)
 	Q_STREAM_PACKET_CONTEXT_PACKET_SIZE = g_quark_from_static_string("stream.packet.context.packet_size");
 }
 
+static
+struct ctf_callsite *ctf_trace_callsite_lookup(struct ctf_trace *trace,
+			GQuark callsite_name)
+{
+	return g_hash_table_lookup(trace->callsites,
+			(gpointer) (unsigned long) callsite_name);
+}
+
 int print_field(struct definition *definition)
 {
 	/* Print all fields in verbose mode */
@@ -323,7 +334,8 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *
 		else
 			fprintf(pos->fp, " ");
 	}
-	if ((opt_trace_hostname_field && !opt_all_fields) && stream_class->trace->env.hostname[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 = ");
@@ -333,7 +345,7 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *
 			fprintf(pos->fp, ", ");
 		dom_print = 1;
 	}
-	if ((opt_trace_domain_field && !opt_all_fields) && stream_class->trace->env.domain[0] != '\0') {
+	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 = ");
@@ -343,7 +355,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 = ");
@@ -355,7 +368,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 = ");
@@ -381,6 +395,39 @@ 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 ((opt_callsite_field || opt_all_fields)) {
+		struct ctf_callsite *callsite;
+
+		callsite = ctf_trace_callsite_lookup(stream_class->trace,
+				event_class->name);
+		if (callsite) {
+			set_field_names_print(pos, ITEM_HEADER);
+			if (pos->print_names) {
+				fprintf(pos->fp, "callsite = ");
+			} else if (dom_print) {
+				fprintf(pos->fp, ":");
+			}
+			fprintf(pos->fp, "[%s@%s:%" PRIu64 "]",
+				callsite->func, callsite->file,
+				callsite->line);
+			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);