A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'models_type_rework_part2_try2' into 'master'
[simgrid.git]
/
include
/
xbt
/
backtrace.hpp
diff --git
a/include/xbt/backtrace.hpp
b/include/xbt/backtrace.hpp
index
de3765e
..
007c0c1
100644
(file)
--- a/
include/xbt/backtrace.hpp
+++ b/
include/xbt/backtrace.hpp
@@
-1,32
+1,25
@@
-/* Copyright (c) 2005-20
18
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2005-20
21
. The SimGrid Team. 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 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. */
-#ifndef SIMGRI
X
_XBT_BACKTRACE_HPP
-#define SIMGRI
X
_XBT_BACKTRACE_HPP
+#ifndef SIMGRI
D
_XBT_BACKTRACE_HPP
+#define SIMGRI
D
_XBT_BACKTRACE_HPP
#include <xbt/base.h>
#include <xbt/base.h>
-#include <
cstddef
>
+#include <
functional
>
#include <memory>
#include <string>
#include <memory>
#include <string>
-#include <vector>
-SG_BEGIN_DECL
()
+SG_BEGIN_DECL
/** @brief Shows a backtrace of the current location */
XBT_PUBLIC void xbt_backtrace_display_current();
/** @brief Shows a backtrace of the current location */
XBT_PUBLIC void xbt_backtrace_display_current();
-SG_END_DECL
()
+SG_END_DECL
namespace simgrid {
namespace xbt {
namespace simgrid {
namespace xbt {
-/** Try to demangle a C++ name
- *
- * Return the origin string if this fails.
- */
-XBT_PUBLIC std::unique_ptr<char, void (*)(void*)> demangle(const char* name);
-
class BacktraceImpl;
/** A backtrace
*
class BacktraceImpl;
/** A backtrace
*
@@
-37,21
+30,14
@@
class BacktraceImpl;
*/
class Backtrace {
public:
*/
class Backtrace {
public:
-
BacktraceImpl* impl_ = nullptr
;
+
std::shared_ptr<BacktraceImpl> impl_
;
Backtrace();
Backtrace();
- Backtrace(const Backtrace& bt);
- ~Backtrace();
+ /** @brief Translate the backtrace in a human friendly form, unmangled with source code locations. */
+ std::string resolve() const;
+ /** @brief Display the resolved backtrace on stderr */
+ void display() const;
};
};
-/* Translate the backtrace in an human friendly form
- *
- * Try resolve symbols and source code locations.
- */
-XBT_PUBLIC std::string resolve_backtrace(const Backtrace& bt);
}
}
}
}
-
-/** @brief Display a previously captured backtrace */
-XBT_PUBLIC void xbt_backtrace_display(const simgrid::xbt::Backtrace& bt);
-
#endif
#endif