X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/931c72e9293d64a1797a6187dd0e744408c23d59..01d2ec474c4c1828c229830ba4e4961de5f0527d:/include/xbt/backtrace.hpp

diff --git a/include/xbt/backtrace.hpp b/include/xbt/backtrace.hpp
index ca3f282e52..27b9f8e810 100644
--- a/include/xbt/backtrace.hpp
+++ b/include/xbt/backtrace.hpp
@@ -1,17 +1,23 @@
-/* Copyright (c) 2005-2019. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2005-2019. The SimGrid Team. All rights reserved.          */
 
-#ifndef SIMGRIX_XBT_BACKTRACE_HPP
-#define SIMGRIX_XBT_BACKTRACE_HPP
+/* 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. */
 
-#include <cstddef>
+#ifndef SIMGRID_XBT_BACKTRACE_HPP
+#define SIMGRID_XBT_BACKTRACE_HPP
 
-#include <string>
+#include <xbt/base.h>
+
+#include <cstddef>
+#include <functional>
 #include <memory>
+#include <string>
 #include <vector>
 
-#include <xbt/base.h>
-#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()
 
 namespace simgrid {
 namespace xbt {
@@ -20,19 +26,31 @@ namespace xbt {
  *
  *  Return the origin string if this fails.
  */
-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 std::unique_ptr<char, std::function<void(char*)>> demangle(const char* name);
 
-/* Translate the backtrace in a human friendly form
+class BacktraceImpl;
+/** A backtrace
  *
- *  Try ro resolve symbols and source code location.
+ *  This is used (among other things) in exceptions to store the associated
+ *  backtrace.
+ *
+ *  @ingroup XBT_ex
  */
-XBT_PUBLIC(std::vector<std::string>) resolveBacktrace(
-  xbt_backtrace_location_t const* loc, std::size_t count);
+class Backtrace {
+public:
+  BacktraceImpl* impl_ = nullptr;
+  Backtrace();
+  Backtrace(const Backtrace& bt);
+  Backtrace(Backtrace&& bt);
+  Backtrace& operator=(const Backtrace& rhs);
+  Backtrace& operator=(Backtrace&& rhs);
+  ~Backtrace();
+  /** @brief Translate the backtrace in a human friendly form, unmangled with source code locations. */
+  std::string const resolve() const;
+  /** @brief Display the resolved backtrace on stderr */
+  void display() const;
+};
 
 }
 }
-
 #endif