Changeset d4631b971e1f9590c6c91c0c266bfe665fccaaaf

Timestamp:

06/21/10 09:04:19 (2 years ago)

Author:

Antti-Juhani Kaijanaho <ajk@…>

Children:

72ebe081314754cf0300ebd5b8969fac31b3330e

Parents:

959687afa28ccfe698945609bed89f4f17adc1cb

git-committer:

Antti-Juhani Kaijanaho <ajk@…> (06/21/10 09:04:19)

Message:

Use gdb to get more readable assertion backtraces

Signed-off-by: Antti-Juhani Kaijanaho <ajk@…>

Files:

• GNUmakefile.in (modified) (1 diff)
• assert_handler.cc (modified) (2 diffs)
• config.cc (modified) (1 diff)

GNUmakefile.in

@@ -17 +17 @@
          @BOOST_PROGRAM_OPTIONS_LIB@ @BOOST_THREAD_LIB@ \
          @GnuTLS_LIBS@
-DEFS = @DEFS@ -DCONFFILE=\"$(cfgfile)\"
+DEFS = @DEFS@ -DCONFFILE=\"$(cfgfile)\" -DBINDIR=\"${bindir}\"
 
 INSTALL = @INSTALL@

assert_handler.cc

@@ -18 +18 @@
  */
 
+#include "config.hh"
 #include "logger/logline.hh"
 
 #include <boost/assert.hpp>
 #include <execinfo.h>
+#include <stdio.h>
 
 namespace boost
@@ -50 +52 @@
                 {
                         ll.nl();
-                        ll << "\t" << bt[i];
+                        ll << "\t" << bt[i] << "\n";
+                        std::string bta = bt[i];
+                        int ob = bta.find('[');
+                        int cb = bta.rfind(']');
+                        if (ob == std::string::npos || cb == std::string::npos) continue;
+                        bta = bta.substr(ob + 1, cb - ob - 1);
+                        std::string gdb = "gdb --batch --ex 'info line *";
+                        gdb += bta;
+                        gdb += "' ";
+                        gdb += config["executable"].as<std::string>(); 
+                        gdb += " </dev/null";
+                        FILE *fp = ::popen(gdb.c_str(), "r");
+                        if (fp != 0)
+                        {
+                                while (true)
+                                {
+                                        char buf[128];
+                                        int n = ::fread(buf, 1, sizeof buf, fp);
+                                        ll << std::string(buf, n); 
+                                        if (n == 0) break;
+                                }
+                                ::pclose(fp);
+                        }
                 }
                 ll.close();

config.cc

@@ -53 +53 @@
         opts.add_options()
                 ( "help", "show this help message")
+                ( "executable",
+                  po::value<std::string>()->default_value(BINDIR "/alue"),
+                  "the location of a debuggable executable (for backtraces)" )
                 ( "daemon",
                   po::value<bool>()->default_value(true),