X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Ftrace-debuginfo.h;h=cf4069a228496245575bbabb6936d0ffdac5c41e;hp=963ec97fb45ff6789199422746fc283e60742fba;hb=ad2b5b38baf7f69697162ef460e86c90035fe088;hpb=458af89d3baff393a4c38f70520fb51b811ad932

diff --git a/include/babeltrace/trace-debuginfo.h b/include/babeltrace/trace-debuginfo.h
index 963ec97f..cf4069a2 100644
--- a/include/babeltrace/trace-debuginfo.h
+++ b/include/babeltrace/trace-debuginfo.h
@@ -46,7 +46,8 @@ void ctf_text_integer_write_debug_info(struct bt_stream_pos *ppos,
 
 	/* Print debug info if available */
 	if (debug_info_src) {
-		if (debug_info_src->func || debug_info_src->filename) {
+		if (debug_info_src->func || debug_info_src->src_path ||
+				debug_info_src->bin_path) {
 			bool add_comma = false;
 
 			fprintf(pos->fp, ", debug_info = { ");
@@ -57,7 +58,7 @@ void ctf_text_integer_write_debug_info(struct bt_stream_pos *ppos,
 				add_comma = true;
 			}
 
-			if (debug_info_src->filename) {
+			if (debug_info_src->src_path) {
 				if (add_comma) {
 					fprintf(pos->fp, ", ");
 				}
@@ -65,11 +66,22 @@ void ctf_text_integer_write_debug_info(struct bt_stream_pos *ppos,
 				fprintf(pos->fp, "src = \"%s:%" PRIu64
 						"\"",
 						opt_debug_info_full_path ?
-						debug_info_src->filename :
-						debug_info_src->short_filename,
+						debug_info_src->src_path :
+						debug_info_src->short_src_path,
 						debug_info_src->line_no);
 			}
 
+			if (debug_info_src->bin_path) {
+				if (add_comma) {
+					fprintf(pos->fp, ", ");
+				}
+
+				fprintf(pos->fp, "bin = \"%s\"",
+						opt_debug_info_full_path ?
+						debug_info_src->bin_path :
+						debug_info_src->short_bin_path);
+			}
+
 			fprintf(pos->fp, " }");
 		}
 	}