Skip to content
Merged
Show file tree
Hide file tree
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
5 changes: 1 addition & 4 deletions ddprof-lib/src/main/cpp/os_dd.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@
namespace ddprof {
class OS : public ::OS {
public:
inline static SigAction replaceSigsegvHandler(SigAction action) {
return ::OS::replaceCrashHandler(action);
}

static SigAction replaceSigsegvHandler(SigAction action);
static SigAction replaceSigbusHandler(SigAction action);

inline static int getMaxThreadId(int floor) {
Expand Down
4 changes: 4 additions & 0 deletions ddprof-lib/src/main/cpp/os_linux_dd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ void ddprof::OS::mallocArenaMax(int arena_max) {
#endif
}

SigAction ddprof::OS::replaceSigsegvHandler(SigAction action) {
return ::OS::replaceCrashHandler(action);
}

SigAction ddprof::OS::replaceSigbusHandler(SigAction action) {
struct sigaction sa;
sigaction(SIGBUS, NULL, &sa);
Expand Down
8 changes: 6 additions & 2 deletions ddprof-lib/src/main/cpp/os_macos_dd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,15 @@ void ddprof::OS::mallocArenaMax(int arena_max) {
}

SigAction ddprof::OS::replaceSigbusHandler(SigAction action) {
return ::OS::replaceCrashHandler(action);
}

SigAction ddprof::OS::replaceSigsegvHandler(SigAction action) {
struct sigaction sa;
sigaction(SIGBUS, NULL, &sa);
sigaction(SIGSEGV, NULL, &sa);
SigAction old_action = sa.sa_sigaction;
sa.sa_sigaction = action;
sigaction(SIGBUS, &sa, NULL);
sigaction(SIGSEGV, &sa, NULL);
return old_action;
}

Expand Down
Loading