Print bin location first

[babeltrace.git] / include / babeltrace / trace-debuginfo.h

diff --git a/include/babeltrace/trace-debuginfo.h b/include/babeltrace/trace-debuginfo.h
index adbad09d6c6533082aaafb0374f750706c464cee..ed6292319e29f080f03677c923c996022b690be6 100644 (file)
--- a/include/babeltrace/trace-debuginfo.h
+++ b/include/babeltrace/trace-debuginfo.h
@@ -46,25 +46,40 @@ 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 = { ");
 
+                       if (debug_info_src->bin_path) {
+                               fprintf(pos->fp, "bin = \"%s%s\"",
+                                               opt_debug_info_full_path ?
+                                               debug_info_src->bin_path :
+                                               debug_info_src->short_bin_path,
+                                               debug_info_src->bin_loc);
+                               add_comma = true;
+                       }
+
                        if (debug_info_src->func) {
+                               if (add_comma) {
+                                       fprintf(pos->fp, ", ");
+                               }
+
                                fprintf(pos->fp, "func = \"%s\"",
                                                debug_info_src->func);
-                               add_comma = true;
                        }
 
-                       if (debug_info_src->filename) {
+                       if (debug_info_src->src_path) {
                                if (add_comma) {
                                        fprintf(pos->fp, ", ");
                                }
 
-                               fprintf(pos->fp, "source_loc = \"%s:%" PRIu64
+                               fprintf(pos->fp, "src = \"%s:%" PRIu64
                                                "\"",
-                                               debug_info_src->filename,
+                                               opt_debug_info_full_path ?
+                                               debug_info_src->src_path :
+                                               debug_info_src->short_src_path,
                                                debug_info_src->line_no);
                        }