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

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index e23bb9e2..40f2f008 100644
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -50,6 +50,7 @@ int opt_all_field_names,
 	opt_trace_default_fields = 1,
 	opt_loglevel_field,
 	opt_emf_field,
+	opt_callsite_field,
 	opt_delta_field = 1;
 
 enum field_item {
@@ -117,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_dups *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 */
@@ -399,6 +408,42 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *
 			fprintf(pos->fp, ", ");
 		dom_print = 1;
 	}
+	if ((opt_callsite_field || opt_all_fields)) {
+		struct ctf_callsite_dups *cs_dups;
+		struct ctf_callsite *callsite;
+
+		cs_dups = ctf_trace_callsite_lookup(stream_class->trace,
+				event_class->name);
+		if (cs_dups) {
+			int i = 0;
+
+			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, "[");
+			bt_list_for_each_entry(callsite, &cs_dups->head, node) {
+				if (i != 0)
+					fprintf(pos->fp, ",");
+				if (CTF_CALLSITE_FIELD_IS_SET(callsite, ip)) {
+					fprintf(pos->fp, "%s@0x%" PRIx64 ":%s:%" PRIu64 "",
+						callsite->func, callsite->ip, callsite->file,
+						callsite->line);
+				} else {
+					fprintf(pos->fp, "%s:%s:%" PRIu64 "",
+						callsite->func, callsite->file,
+						callsite->line);
+				}
+				i++;
+			}
+			fprintf(pos->fp, "]");
+			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);