From 2681efaf0e0457ef7f4246033fe0e97e8d352172 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 31 Mar 2020 10:49:31 -0700 Subject: os/signal, runtime: remove runtime sigqueue initialization We can initialize the runtime sigqueue packages on first use. We don't require an explicit initialization step. So, remove it. Change-Id: I484e02dc2c67395fd5584f35ecda2e28b37168df Reviewed-on: https://go-review.googlesource.com/c/go/+/226540 Run-TryBot: Ian Lance Taylor Reviewed-by: Bryan C. Mills --- src/runtime/sigqueue.go | 9 +++------ src/runtime/sigqueue_plan9.go | 5 +---- 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'src/runtime') diff --git a/src/runtime/sigqueue.go b/src/runtime/sigqueue.go index b2ebb2b457..3bf07cb5a6 100644 --- a/src/runtime/sigqueue.go +++ b/src/runtime/sigqueue.go @@ -192,16 +192,13 @@ func signalWaitUntilIdle() { //go:linkname signal_enable os/signal.signal_enable func signal_enable(s uint32) { if !sig.inuse { - // The first call to signal_enable is for us - // to use for initialization. It does not pass - // signal information in m. + // This is the first call to signal_enable. Initialize. sig.inuse = true // enable reception of signals; cannot disable if GOOS == "darwin" { sigNoteSetup(&sig.note) - return + } else { + noteclear(&sig.note) } - noteclear(&sig.note) - return } if s >= uint32(len(sig.wanted)*32) { diff --git a/src/runtime/sigqueue_plan9.go b/src/runtime/sigqueue_plan9.go index 934742a1f4..d5fe8f8b35 100644 --- a/src/runtime/sigqueue_plan9.go +++ b/src/runtime/sigqueue_plan9.go @@ -134,12 +134,9 @@ func signalWaitUntilIdle() { //go:linkname signal_enable os/signal.signal_enable func signal_enable(s uint32) { if !sig.inuse { - // The first call to signal_enable is for us - // to use for initialization. It does not pass - // signal information in m. + // This is the first call to signal_enable. Initialize. sig.inuse = true // enable reception of signals; cannot disable noteclear(&sig.note) - return } } -- cgit v1.3-5-g9baa