mirror of
https://github.com/golang/go
synced 2024-11-17 21:04:43 -07:00
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 <elias.naur@gmail.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
parent
7d80a2ea18
commit
5500c9ce27
@ -411,3 +411,31 @@ func TestCgoNumGoroutine(t *testing.T) {
|
||||
t.Errorf("expected %q got %v", want, got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCatchPanic(t *testing.T) {
|
||||
t.Parallel()
|
||||
switch runtime.GOOS {
|
||||
case "plan9", "windows":
|
||||
t.Skipf("no signals on %s", runtime.GOOS)
|
||||
case "darwin":
|
||||
if runtime.GOARCH == "amd64" {
|
||||
t.Skipf("crash() on darwin/amd64 doesn't raise SIGABRT")
|
||||
}
|
||||
}
|
||||
|
||||
testenv.MustHaveGoRun(t)
|
||||
|
||||
exe, err := buildTestProg(t, "testprogcgo")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
cmd := testEnv(exec.Command(exe, "CgoCatchPanic"))
|
||||
// Make sure a panic results in a crash.
|
||||
cmd.Env = append(cmd.Env, "GOTRACEBACK=crash")
|
||||
// Tell testprogcgo to install an early signal handler for SIGABRT
|
||||
cmd.Env = append(cmd.Env, "CGOCATCHPANIC_INSTALL_HANDLER=1")
|
||||
if out, err := cmd.CombinedOutput(); err != nil {
|
||||
t.Errorf("testprogcgo CgoCatchPanic failed: %v\n%s", err, out)
|
||||
}
|
||||
}
|
||||
|
@ -394,8 +394,11 @@ func sigpanic() {
|
||||
//go:nosplit
|
||||
//go:nowritebarrierrec
|
||||
func dieFromSignal(sig uint32) {
|
||||
setsig(sig, _SIG_DFL)
|
||||
unblocksig(sig)
|
||||
// First, try any signal handler installed before the runtime
|
||||
// initialized.
|
||||
fn := atomic.Loaduintptr(&fwdSig[sig])
|
||||
setsig(sig, fn)
|
||||
raise(sig)
|
||||
|
||||
// That should have killed us. On some systems, though, raise
|
||||
@ -407,6 +410,14 @@ func dieFromSignal(sig uint32) {
|
||||
osyield()
|
||||
osyield()
|
||||
|
||||
// If that didn't work, try _SIG_DFL.
|
||||
setsig(sig, _SIG_DFL)
|
||||
raise(sig)
|
||||
|
||||
osyield()
|
||||
osyield()
|
||||
osyield()
|
||||
|
||||
// If we are still somehow running, just exit with the wrong status.
|
||||
exit(2)
|
||||
}
|
||||
|
39
src/runtime/testdata/testprogcgo/catchpanic.go
vendored
Normal file
39
src/runtime/testdata/testprogcgo/catchpanic.go
vendored
Normal file
@ -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 <signal.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
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")
|
||||
}
|
Loading…
Reference in New Issue
Block a user