From 5500c9ce27128ab26aa23bafddce7dd512ce72ea Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Tue, 18 Jul 2017 14:17:57 +0200 Subject: runtime: when dying from a signal use the previous signal handler Before this CL, whenever the Go runtime wanted to kill its own process with a signal dieFromSignal would reset the signal handler to _SIG_DFL. Unfortunately, if any signal handler were installed before the Go runtime initialized, it wouldn't be invoked either. Instead, use whatever signal handler was installed before initialization. The motivating use case is Crashlytics on Android. Before this CL, Crashlytics would not consider a crash from a panic() since the corresponding SIGABRT never reached its signal handler. Updates #11382 Updates #20392 (perhaps even fixes it) Fixes #19389 Change-Id: I0c8633329433b45cbb3b16571bea227e38e8be2e Reviewed-on: https://go-review.googlesource.com/49590 Run-TryBot: Elias Naur TryBot-Result: Gobot Gobot Reviewed-by: Ian Lance Taylor --- src/runtime/testdata/testprogcgo/catchpanic.go | 39 ++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 src/runtime/testdata/testprogcgo/catchpanic.go (limited to 'src/runtime/testdata') diff --git a/src/runtime/testdata/testprogcgo/catchpanic.go b/src/runtime/testdata/testprogcgo/catchpanic.go new file mode 100644 index 0000000000..f03b6d3ea3 --- /dev/null +++ b/src/runtime/testdata/testprogcgo/catchpanic.go @@ -0,0 +1,39 @@ +// Copyright 2017 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build !plan9,!windows + +package main + +/* +#include +#include +#include + +static void abrthandler(int signum) { + if (signum == SIGABRT) { + exit(0); // success + } +} + +static void __attribute__ ((constructor)) sigsetup(void) { + struct sigaction act; + + if (getenv("CGOCATCHPANIC_INSTALL_HANDLER") == NULL) + return; + memset(&act, 0, sizeof act); + act.sa_handler = abrthandler; + sigaction(SIGABRT, &act, NULL); +} +*/ +import "C" + +func init() { + register("CgoCatchPanic", CgoCatchPanic) +} + +// Test that the SIGABRT raised by panic can be caught by an early signal handler. +func CgoCatchPanic() { + panic("catch me") +} -- cgit v1.3-5-g9baa