X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/528fa2ce6be027b5428d122666ffc37706155449..1d04f47ddcc46f37eca622ca5a343c7197115990:/src/xbt/backtrace.cpp

diff --git a/src/xbt/backtrace.cpp b/src/xbt/backtrace.cpp
index e64eab1add..8831610058 100644
--- a/src/xbt/backtrace.cpp
+++ b/src/xbt/backtrace.cpp
@@ -1,49 +1,22 @@
-/* Copyright (c) 2005-2016. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2005-2016. The SimGrid Team. All rights reserved.          */
 
-/*  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>       */
-/*  Copyright (c) 2002-2004 The OSSP Project <http://www.ossp.org/>         */
-/*  Copyright (c) 2002-2004 Cable & Wireless <http://www.cw.com/>           */
-/*  All rights reserved.                                                    */
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
-/* This code is inspirated from the OSSP version (as retrieved back in 2004)*/
-/* It was heavily modified to fit the SimGrid framework.                    */
-
-/* The OSSP version has the following copyright notice:
-**  OSSP ex - Exception Handling
-**  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
-**  Copyright (c) 2002-2004 The OSSP Project <http://www.ossp.org/>
-**  Copyright (c) 2002-2004 Cable & Wireless <http://www.cw.com/>
-**
-**  This file is part of OSSP ex, an exception handling library
-**  which can be found at http://www.ossp.org/pkg/lib/ex/.
-**
-**  Permission to use, copy, modify, and distribute this software for
-**  any purpose with or without fee is hereby granted, provided that
-**  the above copyright notice and this permission notice appear in all
-**  copies.
-**
-**  THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESSED OR IMPLIED
-**  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-**  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-**  IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-**  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-**  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-**  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-**  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-**  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-**  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-**  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-**  SUCH DAMAGE.
- */
+#include <cstddef>
+#include <cstdlib>
 
-/* The extensions made for the SimGrid project can either be distributed    */
-/* under the same license, or under the LGPL v2.1                           */
+#include <vector>
 
-#include <cstddef>
+// Try to detect and use the C++ intanium ABI for name demangling:
+#ifdef __GXX_ABI_VERSION
+#include <cxxabi.h>
+#endif
 
-#include <xbt/log.h>
 #include <xbt/backtrace.h>
+#include <xbt/backtrace.hpp>
+#include <xbt/log.h>
+#include <xbt/sysdep.h>
 
 #include "src/internal_config.h"
 
@@ -53,8 +26,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_backtrace, xbt, "Backtrace");
 
 }
 
-/** \brief show the backtrace of the current point (lovely while debuging) */
-void xbt_backtrace_display_current(void)
+/** @brief show the backtrace of the current point (lovely while debugging) */
+void xbt_backtrace_display_current()
 {
   const std::size_t size = 10;
   xbt_backtrace_location_t bt[size];
@@ -62,6 +35,36 @@ void xbt_backtrace_display_current(void)
   xbt_backtrace_display(bt, used);
 }
 
+namespace simgrid {
+namespace xbt {
+
+std::unique_ptr<char, void(*)(void*)> demangle(const char* name)
+{
+#ifdef __GXX_ABI_VERSION
+  int status;
+  auto res = std::unique_ptr<char, void(*)(void*)>(
+    abi::__cxa_demangle(name, nullptr, nullptr, &status),
+    std::free
+  );
+  if (res != nullptr)
+    return res;
+  // We did not manage to resolve this. Probably because this is not a mangled symbol:
+#endif
+  // Return the symbol:
+  return std::unique_ptr<char, void(*)(void*)>(xbt_strdup(name), std::free);
+}
+
+std::vector<xbt_backtrace_location_t> backtrace()
+{
+  const std::size_t size = 10;
+  xbt_backtrace_location_t loc[size];
+  size_t used = xbt_backtrace_current(loc, size);
+  return std::vector<xbt_backtrace_location_t>(loc, loc + used);
+}
+
+}
+}
+
 #if HAVE_BACKTRACE && HAVE_EXECINFO_H && HAVE_POPEN && defined(ADDR2LINE)
 # include "src/xbt/backtrace_linux.cpp"
 #else