[PATCH] stack: show binary and source file names where a function is defined

[Masatake YAMATO <yamato at redhat dot com>]

This patch added the binary file name where the function is
defined when -v option is given, and the source file name
where the function is defined when -v -v options are given.

This is based on private discussion with Jan Kratochvil
<jan.kratochvil@redhat.com>.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
---
 src/ChangeLog |  9 +++++++++
 src/stack.c   | 26 ++++++++++++++++++++++----
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index f899858..3bf2426 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2013-12-16  Masatake YAMATO  <yamato@redhat.com>
+
+	* stack.c (verbose): Change the type to int.
+	(parse_opt): Increment verbose for each time when
+	'-v' is found.
+	(main): Added '-v' to the help message.
+	(frame_callback): Print binary and source file name
+	if verbose > 0.
+
 2013-11-25  Petr Machata  <pmachata@redhat.com>
 
 	* elflint.c (valid_e_machine): Add EM_AARCH64.
diff --git a/src/stack.c b/src/stack.c
index f428ed0..edb479f 100644
--- a/src/stack.c
+++ b/src/stack.c
@@ -36,7 +36,7 @@ ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
 /* Bug report address.  */
 ARGP_PROGRAM_BUG_ADDRESS_DEF = PACKAGE_BUGREPORT;
 
-static bool verbose = false;
+static int verbose = 0;
 
 static int
 frame_callback (Dwfl_Frame *state, void *arg)
@@ -78,7 +78,25 @@ frame_callback (Dwfl_Frame *state, void *arg)
   printf ("#%-2u 0x%0*" PRIx64, (*framenop)++, width, (uint64_t) pc);
   if (verbose)
     printf ("%4s", ! isactivation ? "- 1" : "");
-  printf (" %s\n", symname);
+  printf (" %s", symname);
+  if (verbose > 0)
+    {
+      const char* fname;
+      Dwfl_Line * lineobj;
+      int line, col;
+      const char* sname;
+
+      fname = dwfl_module_info(mod, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+      printf (" - %s", fname? fname: "?");
+      if (verbose > 1)
+	{
+	  lineobj = dwfl_module_getsrc(mod, pc_adjusted);
+	  line = col = -1;
+	  sname = lineobj? (dwfl_lineinfo(lineobj, NULL, &line, &col, NULL, NULL)?: "?"): "?";
+	  printf(" (%s:%d:%d)", sname, line, col);
+	}
+    }
+  printf ("\n");
   return DWARF_CB_OK;
 }
 
@@ -118,7 +136,7 @@ parse_opt (int key, char *arg __attribute__ ((unused)),
       break;
 
     case 'v':
-      verbose = true;
+      verbose++;
       break;
 
     default:
@@ -165,7 +183,7 @@ Only real user processes are supported, no kernel or process maps."),
   argp_parse (&argp, argc, argv, 0, &remaining, &dwfl);
   assert (dwfl != NULL);
   if (remaining != argc)
-    error (2, 0, "eu-stack [--debuginfo-path=<path>] {-p <process id>|"
+    error (2, 0, "eu-stack [-v [-v]] [--debuginfo-path=<path>] {-p <process id>|"
 		 "--core=<file> [--executable=<file>]|--help}");
 
   /* dwfl_linux_proc_report has been already called from dwfl_standard_argp's
-- 
1.8.3.1