hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix backtraces in asserts

Browse Source
This commit is contained in:
Sebastian Messmer 2015-10-03 01:23:30 +02:00
parent 3fed6f13cb
commit 0bb278bcdd
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
assert/assert.h
View File

@ -17,9 +17,10 @@ namespace cpputils {
namespace _assert { namespace _assert {
inline std::string format(const char *expr, const char *message, const char *file, int line) { inline std::string format(const char *expr, const char *message, const char *file, int line) {
// get void*'s for all entries on the stack // get void*'s for all entries on the stack
void *array[10]; constexpr unsigned int MAX_SIZE = 100;
size_t size = backtrace(array, sizeof(array)); void *array[MAX_SIZE];
char **backtrace_str = backtrace_symbols(array, sizeof(backtrace_str)); size_t size = backtrace(array, MAX_SIZE);
char **backtrace_str = backtrace_symbols(array, size);
std::string result = std::string()+"Assertion ["+expr+"] failed in "+file+":"+std::to_string(line)+": "+message+"\n\n"; std::string result = std::string()+"Assertion ["+expr+"] failed in "+file+":"+std::to_string(line)+": "+message+"\n\n";
for (unsigned int i = 0; i < size; ++i) { for (unsigned int i = 0; i < size; ++i) {
result += std::string(backtrace_str[i]) + "\n"; result += std::string(backtrace_str[i]) + "\n";

5
assert/backtrace.cpp
View File

@ -9,8 +9,9 @@
namespace cpputils { namespace cpputils {
void sigsegv_handler(int) { void sigsegv_handler(int) {
void *array[100]; constexpr unsigned int MAX_SIZE = 100;
size_t size = backtrace(array, sizeof(array)); void *array[MAX_SIZE];
size_t size = backtrace(array, MAX_SIZE);
std::cerr << "Error: SIGSEGV" << std::endl; std::cerr << "Error: SIGSEGV" << std::endl;
backtrace_symbols_fd(array, size, STDERR_FILENO); backtrace_symbols_fd(array, size, STDERR_FILENO);