From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id D2EE23836797; Wed, 7 Dec 2022 20:06:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D2EE23836797 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670443600; bh=pHztGK3/ZMwtjxR33bPtZiMhGoZTkqhuupreIJGjuZc=; h=From:To:Subject:Date:From; b=Jlc+EPKTvCe73XeX5tMzu6ST6pjhDMmAZxTZPPXqXVAHxjSxwyGOADC4Wq7AoTnja mZVEyVqKoXiXeWUIteg50g5NOxrFj0jAbdHTWCTrmvQW0MIxoXy5sBHvdpFNgCFXUb /kUBxX73IN2nLsSTb2616U+qBYqdoP6V8aNvKVg8= MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-4543] libstdc++: Pass error handler to libbacktrace functions X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: dc02d4a99a7073dbef193c93529f2e1b64addfe2 X-Git-Newrev: 3ad0f470c16d5528a5283060b007f8b419c33c92 Message-Id: <20221207200640.D2EE23836797@sourceware.org> Date: Wed, 7 Dec 2022 20:06:40 +0000 (GMT) List-Id: https://gcc.gnu.org/g:3ad0f470c16d5528a5283060b007f8b419c33c92 commit r13-4543-g3ad0f470c16d5528a5283060b007f8b419c33c92 Author: Jonathan Wakely Date: Wed Nov 30 12:32:53 2022 +0000 libstdc++: Pass error handler to libbacktrace functions Also pass threaded=1 to __glibcxx_backtrace_create_state and remove some of the namespace scope declarations in the header. Co-authored-by: François Dumont libstdc++-v3/ChangeLog: * include/debug/formatter.h [_GLIBCXX_DEBUG_BACKTRACE] (_Error_formatter::_Error_formatter): Pass error handler to __glibcxx_backtrace_create_state. Pass 1 for threaded argument. (_Error_formatter::_S_err): Define empty function. * src/c++11/debug.cc (_Error_formatter::_M_error): Pass error handler to __glibcxx_backtrace_full. Diff: --- libstdc++-v3/include/debug/formatter.h | 35 ++++++++++++---------------------- libstdc++-v3/src/c++11/debug.cc | 19 +++++++++++++++++- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/libstdc++-v3/include/debug/formatter.h b/libstdc++-v3/include/debug/formatter.h index f120163c6d4..e8a83a21bde 100644 --- a/libstdc++-v3/include/debug/formatter.h +++ b/libstdc++-v3/include/debug/formatter.h @@ -32,32 +32,17 @@ #include #if _GLIBCXX_HAVE_STACKTRACE -struct __glibcxx_backtrace_state; - extern "C" { - __glibcxx_backtrace_state* + struct __glibcxx_backtrace_state* __glibcxx_backtrace_create_state(const char*, int, void(*)(void*, const char*, int), void*); - - typedef int (*__glibcxx_backtrace_full_callback) ( - void*, __UINTPTR_TYPE__, const char *, int, const char*); - - typedef void (*__glibcxx_backtrace_error_callback) ( - void*, const char*, int); - - typedef int (*__glibcxx_backtrace_full_func) ( - __glibcxx_backtrace_state*, int, - __glibcxx_backtrace_full_callback, - __glibcxx_backtrace_error_callback, - void*); - int __glibcxx_backtrace_full( - __glibcxx_backtrace_state*, int, - __glibcxx_backtrace_full_callback, - __glibcxx_backtrace_error_callback, + struct __glibcxx_backtrace_state*, int, + int (*)(void*, __UINTPTR_TYPE__, const char *, int, const char*), + void (*)(void*, const char*, int), void*); } #endif @@ -609,10 +594,10 @@ namespace __gnu_debug , _M_function(__function) #if _GLIBCXX_HAVE_STACKTRACE # ifdef _GLIBCXX_DEBUG_BACKTRACE - , _M_backtrace_state(__glibcxx_backtrace_create_state(0, 0, 0, 0)) + , _M_backtrace_state(__glibcxx_backtrace_create_state(0, 1, _S_err, 0)) , _M_backtrace_full(&__glibcxx_backtrace_full) # else - , _M_backtrace_state() + , _M_backtrace_state(0) # endif #endif { } @@ -631,8 +616,12 @@ namespace __gnu_debug const char* _M_text; const char* _M_function; #if _GLIBCXX_HAVE_STACKTRACE - __glibcxx_backtrace_state* _M_backtrace_state; - __glibcxx_backtrace_full_func _M_backtrace_full; + struct __glibcxx_backtrace_state* _M_backtrace_state; + // TODO: Remove _M_backtrace_full after __glibcxx_backtrace_full is moved + // from libstdc++_libbacktrace.a to libstdc++.so: + __decltype(&__glibcxx_backtrace_full) _M_backtrace_full; + + static void _S_err(void*, const char*, int) { } #endif public: diff --git a/libstdc++-v3/src/c++11/debug.cc b/libstdc++-v3/src/c++11/debug.cc index 9eda38023f7..83996ffe622 100644 --- a/libstdc++-v3/src/c++11/debug.cc +++ b/libstdc++-v3/src/c++11/debug.cc @@ -1141,6 +1141,23 @@ namespace return ret; } + + void + print_backtrace_error(void* data, const char* msg, int errnum) + { + PrintContext& ctx = *static_cast(data); + + print_literal(ctx, "Backtrace unavailable: "); + print_word(ctx, msg ? msg : ""); + if (errnum > 0) + { + char buf[64]; + int written = __builtin_sprintf(buf, " (errno=%d)\n", errnum); + print_word(ctx, buf, written); + } + else + print_literal(ctx, "\n"); + } #endif } @@ -1193,7 +1210,7 @@ namespace __gnu_debug { print_literal(ctx, "Backtrace:\n"); _M_backtrace_full( - _M_backtrace_state, 1, print_backtrace, nullptr, &ctx); + _M_backtrace_state, 1, print_backtrace, print_backtrace_error, &ctx); ctx._M_first_line = true; print_literal(ctx, "\n"); }