Changeset 20774

Timestamp:

09/06/07 15:27:10 (1 year ago)

Author:

patrick

Message:

Demangle function names when getting the stack trace on Mac OS X.

Files:

• juggler/trunk/modules/vapor/vpr/SystemBase.cpp (modified) (8 diffs)

juggler/trunk/modules/vapor/vpr/SystemBase.cpp

@@ -36 +36 @@
-#include <vpr/vprConfig.h>
-
+#include <cstdlib>
+#include <sstream>
+#include <string>
+
-#if defined(HAVE_BACKTRACE)
-#  include <sys/types.h>
-#  include <unistd.h>
-#  include <execinfo.h>
-#  include <sstream>
-#elif defined(VPR_OS_Darwin)
-#  include <iomanip>
-#  include <sstream>
-#  include <vector>
+#  include <boost/algorithm/string/predicate.hpp>
-
-extern "C"
@@ -61 +64 @@
-#  endif
-
-#  include <stdlib.h>
-#  include <dbghelp.h>
-#  include <iomanip>
-#  include <sstream>
-#  include <boost/format.hpp>
-#endif
-
-#include <string>
-
-#if (! defined(__INTEL_COMPILER) && defined(__GNUC__) && \
@@ -208 +207 @@
-#endif   /* ifdef VPR_OS_Windows */
-
-har*
+onst std::string&
-{
-#ifdef USE_CXA_DEMANGLE
@@ -214 +213 @@
-   // and replace it with a demangled version of the name.
-   // Example: build.linux/stuff/classfile(_ZN4vpr11Someing33methodEv+0xd3) [0x80cfa29]
+   // For Mac OS X, things are a little different. A symbol may be of the
+   // form _ZN3vpr9ExceptionC2ERKSsS2_:F(0,1), or it may be a simple function
+   // name, probably with a leading underscore.
-
-   std::string trace_line(traceLine);
@@ -219 +221 @@
-
-   std::string::size_type start(std::string::npos), end(std::string::npos);
+
+#if defined(VPR_OS_Darwin)
+   end = trace_line.find(":F(");
+
+   // If trace_line does not contain ":F(", then we set the start to be either
+   // 0 or 1 depending on whether trace_line starts with "_", and we set end
+   // to be the end of the string.
+   if ( std::string::npos == end )
+   {
+      start = boost::algorithm::starts_with(trace_line, "_") ? 1 : 0;
+      end   = trace_line.size();
+   }
+   else
+   {
+      start = 0;
+   }
+#else
-   start = trace_line.find("(_");
-   if(std::string::npos != start)
@@ -224 +243 @@
-      end = trace_line.find_first_of("+)",start);
-   }
+#endif
-
-   if(std::string::npos != end)
-   {
-
+
+
+
+
+
+
+
+
+
+
-      int status;
-      char* demangled_buf = abi::__cxa_demangle(mangled_name.c_str(), NULL,
@@ -233 +262 @@
-      if(0==status)
-      {
-
-
-
-
+
+
+
+
+
+
-      }
-      else if(-1==status)
@@ -501 +532 @@
-      cur_frame.pc    = frame->savedLR;
-      cur_frame.frame = reinterpret_cast<size_t>(frame);
-
+
+
+
+
+
+
+
+
-
-      if ( cur_frame.pc != 0 )