Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow customization of signal handler in registration, add flushing #259

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions backward.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3918,7 +3918,6 @@ class cfile_streambuf : public std::streambuf {

private:
FILE *sink;
std::vector<char> buffer;
};

#ifdef BACKWARD_SYSTEM_LINUX
Expand Down Expand Up @@ -4162,16 +4161,15 @@ class SignalHandling {
sizeof posix_signals / sizeof posix_signals[0]);
}

SignalHandling(const std::vector<int> &posix_signals = make_default_signals())
: _loaded(false) {
static bool installHandler(const std::vector<int> &posix_signals,
void (*handler)(int, siginfo_t *, void *),
char *altstack, size_t altstack_size) {
bool success = true;

const size_t stack_size = 1024 * 1024 * 8;
_stack_content.reset(static_cast<char *>(malloc(stack_size)));
if (_stack_content) {
if (altstack) {
stack_t ss;
ss.ss_sp = _stack_content.get();
ss.ss_size = stack_size;
ss.ss_sp = altstack;
ss.ss_size = altstack_size;
ss.ss_flags = 0;
if (sigaltstack(&ss, nullptr) < 0) {
success = false;
Expand All @@ -4191,7 +4189,7 @@ class SignalHandling {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdisabled-macro-expansion"
#endif
action.sa_sigaction = &sig_handler;
action.sa_sigaction = handler;
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
Expand All @@ -4201,9 +4199,21 @@ class SignalHandling {
success = false;
}

_loaded = success;
return success;
}

SignalHandling(const std::vector<int> &posix_signals,
void (*handler)(int, siginfo_t *, void *))
: _loaded(false) {
const size_t stack_size = 1024 * 1024 * 8;
_stack_content.reset(static_cast<char *>(malloc(stack_size)));
_loaded = installHandler(posix_signals, handler, _stack_content.get(),
stack_size);
}

SignalHandling(const std::vector<int> &posix_signals = make_default_signals())
: SignalHandling(posix_signals, sig_handler) {}

bool loaded() const { return _loaded; }

static void handleSignal(int, siginfo_t *info, void *_ctx) {
Expand Down Expand Up @@ -4249,7 +4259,7 @@ class SignalHandling {

Printer printer;
printer.address = true;
printer.print(st, stderr);
fflush(printer.print(st, stderr));

#if (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 700) || \
(defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200809L)
Expand Down Expand Up @@ -4449,7 +4459,7 @@ class SignalHandling {
st.skip_n_firsts(skip_frames);

printer.address = true;
printer.print(st, std::cerr);
printer.print(st, std::cerr) << std::flush;
}
};

Expand Down