backtrace: fix various portability issues I just introduced

[simgrid.git] / include / xbt / backtrace.hpp

diff --git a/include/xbt/backtrace.hpp b/include/xbt/backtrace.hpp
index 291f7925a278034fd63f5288f7088bab1c6b2976..cfcd475229963cf7e6f77204d1cd70feeda55895 100644 (file)
--- a/include/xbt/backtrace.hpp
+++ b/include/xbt/backtrace.hpp
@@ -6,13 +6,19 @@
 #ifndef SIMGRIX_XBT_BACKTRACE_HPP
 #define SIMGRIX_XBT_BACKTRACE_HPP
 
-#include <cstddef>
+#include <xbt/base.h>
 
-#include <string>
+#include <cstddef>
 #include <memory>
+#include <string>
 #include <vector>
 
-#include <xbt/backtrace.h>
+SG_BEGIN_DECL()
+/** @brief Shows a backtrace of the current location */
+XBT_PUBLIC void xbt_backtrace_display_current();
+SG_END_DECL()
+
+typedef void* xbt_backtrace_location_t;
 
 namespace simgrid {
 namespace xbt {
@@ -33,15 +39,20 @@ typedef std::vector<xbt_backtrace_location_t> Backtrace;
 XBT_PUBLIC std::unique_ptr<char, void (*)(void*)> demangle(const char* name);
 
 /** Get the current backtrace */
-XBT_PUBLIC std::vector<xbt_backtrace_location_t> backtrace();
+XBT_PUBLIC Backtrace backtrace();
 
 /* Translate the backtrace in a human friendly form
  *
  *  Try resolve symbols and source code location.
  */
 XBT_PUBLIC std::vector<std::string> resolve_backtrace(xbt_backtrace_location_t const* loc, std::size_t count);
-XBT_ATTRIB_DEPRECATED_v323("Please use xbt::resolve_backtrace()") XBT_PUBLIC std::vector<std::string> resolveBacktrace(xbt_backtrace_location_t const* loc, std::size_t count);
 }
 }
 
+/** @brief Captures a backtrace for further use */
+XBT_PUBLIC size_t xbt_backtrace_current(xbt_backtrace_location_t* loc, size_t count);
+
+/** @brief Display a previously captured backtrace */
+XBT_PUBLIC void xbt_backtrace_display(xbt_backtrace_location_t* loc, size_t count);
+
 #endif