aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTianon Gravi <tianon@debian.org>2019-08-14 15:19:55 +0000
committerAlex Brainman <alex.brainman@gmail.com>2019-08-29 08:15:20 +0000
commit5d1a95175e693f5be0bc31ae9e6a7873318925eb (patch)
tree5c0f0cc93f5501a356898326e86ee5b2a2142528 /src
parentd865b5caa6bedfe90ce9335af518d17f8107fb91 (diff)
downloadgo-5d1a95175e693f5be0bc31ae9e6a7873318925eb.tar.xz
runtime: treat CTRL_CLOSE_EVENT, CTRL_LOGOFF_EVENT, CTRL_SHUTDOWN_EVENT as SIGTERM on Windows
This matches the existing behavior of treating CTRL_C_EVENT, CTRL_BREAK_EVENT as a synthesized SIGINT event. See https://docs.microsoft.com/en-us/windows/console/handlerroutine for a good documentation source upstream to confirm these values. As for the usage of these events, the "Timeouts" section of that upstream documentation is important to note, especially the limited window in which to do any cleanup before the program will be forcibly killed (defaults typically 5s, but as low as 500ms, and in many cases configurable system-wide). These events are especially relevant for Windows containers, where these events (particularly `CTRL_SHUTDOWN_EVENT`) are one of the only ways containers can "gracefully" shut down (https://github.com/moby/moby/issues/25982#issuecomment-466804071). This was verified by making a simple `main()` which implements the same code as in `ExampleNotify_allSignals` but in a `for` loop, building a `main.exe`, running that in a container, then doing `docker kill -sTERM` on said container. The program prints `Got signal: SIGTERM`, then exits after the aforementioned timeout, as expected. Behavior before this patch is that the program gets no notification (and thus no output) but still exits after the timeout. Fixes #7479 Change-Id: I2af79421cd484a0fbb9467bb7ddb5f0e8bc3610e GitHub-Last-Rev: 9e05d631b542393f5ebb0eb3747157c8bd0de635 GitHub-Pull-Request: golang/go#33311 Reviewed-on: https://go-review.googlesource.com/c/go/+/187739 Run-TryBot: Alex Brainman <alex.brainman@gmail.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Alex Brainman <alex.brainman@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/os/signal/doc.go8
-rw-r--r--src/runtime/defs_windows.go10
-rw-r--r--src/runtime/defs_windows_386.go10
-rw-r--r--src/runtime/defs_windows_amd64.go10
-rw-r--r--src/runtime/defs_windows_arm.go10
-rw-r--r--src/runtime/os_windows.go2
-rw-r--r--src/syscall/types_windows.go7
7 files changed, 43 insertions, 14 deletions
diff --git a/src/os/signal/doc.go b/src/os/signal/doc.go
index 16f49c7ab8..2229d36954 100644
--- a/src/os/signal/doc.go
+++ b/src/os/signal/doc.go
@@ -211,6 +211,14 @@ will cause os.Interrupt to be sent on the channel, and the program will
not exit. If Reset is called, or Stop is called on all channels passed
to Notify, then the default behavior will be restored.
+Additionally, if Notify is called, and Windows sends CTRL_CLOSE_EVENT,
+CTRL_LOGOFF_EVENT or CTRL_SHUTDOWN_EVENT to the process, Notify will
+return syscall.SIGTERM. Unlike Control-C and Control-Break, Notify does
+not change process behavior when either CTRL_CLOSE_EVENT,
+CTRL_LOGOFF_EVENT or CTRL_SHUTDOWN_EVENT is received - the process will
+still get terminated unless it exits. But receiving syscall.SIGTERM will
+give the process an opportunity to clean up before termination.
+
Plan 9
On Plan 9, signals have type syscall.Note, which is a string. Calling
diff --git a/src/runtime/defs_windows.go b/src/runtime/defs_windows.go
index 9bd9107476..43f358d56a 100644
--- a/src/runtime/defs_windows.go
+++ b/src/runtime/defs_windows.go
@@ -41,9 +41,13 @@ const (
DUPLICATE_SAME_ACCESS = C.DUPLICATE_SAME_ACCESS
THREAD_PRIORITY_HIGHEST = C.THREAD_PRIORITY_HIGHEST
- SIGINT = C.SIGINT
- CTRL_C_EVENT = C.CTRL_C_EVENT
- CTRL_BREAK_EVENT = C.CTRL_BREAK_EVENT
+ SIGINT = C.SIGINT
+ SIGTERM = C.SIGTERM
+ CTRL_C_EVENT = C.CTRL_C_EVENT
+ CTRL_BREAK_EVENT = C.CTRL_BREAK_EVENT
+ CTRL_CLOSE_EVENT = C.CTRL_CLOSE_EVENT
+ CTRL_LOGOFF_EVENT = C.CTRL_LOGOFF_EVENT
+ CTRL_SHUTDOWN_EVENT = C.CTRL_SHUTDOWN_EVENT
CONTEXT_CONTROL = C.CONTEXT_CONTROL
CONTEXT_FULL = C.CONTEXT_FULL
diff --git a/src/runtime/defs_windows_386.go b/src/runtime/defs_windows_386.go
index 8c0d6d8b98..3c5057b86f 100644
--- a/src/runtime/defs_windows_386.go
+++ b/src/runtime/defs_windows_386.go
@@ -15,9 +15,13 @@ const (
_DUPLICATE_SAME_ACCESS = 0x2
_THREAD_PRIORITY_HIGHEST = 0x2
- _SIGINT = 0x2
- _CTRL_C_EVENT = 0x0
- _CTRL_BREAK_EVENT = 0x1
+ _SIGINT = 0x2
+ _SIGTERM = 0xF
+ _CTRL_C_EVENT = 0x0
+ _CTRL_BREAK_EVENT = 0x1
+ _CTRL_CLOSE_EVENT = 0x2
+ _CTRL_LOGOFF_EVENT = 0x5
+ _CTRL_SHUTDOWN_EVENT = 0x6
_CONTEXT_CONTROL = 0x10001
_CONTEXT_FULL = 0x10007
diff --git a/src/runtime/defs_windows_amd64.go b/src/runtime/defs_windows_amd64.go
index 42a446d3cd..ebb1506e2f 100644
--- a/src/runtime/defs_windows_amd64.go
+++ b/src/runtime/defs_windows_amd64.go
@@ -15,9 +15,13 @@ const (
_DUPLICATE_SAME_ACCESS = 0x2
_THREAD_PRIORITY_HIGHEST = 0x2
- _SIGINT = 0x2
- _CTRL_C_EVENT = 0x0
- _CTRL_BREAK_EVENT = 0x1
+ _SIGINT = 0x2
+ _SIGTERM = 0xF
+ _CTRL_C_EVENT = 0x0
+ _CTRL_BREAK_EVENT = 0x1
+ _CTRL_CLOSE_EVENT = 0x2
+ _CTRL_LOGOFF_EVENT = 0x5
+ _CTRL_SHUTDOWN_EVENT = 0x6
_CONTEXT_CONTROL = 0x100001
_CONTEXT_FULL = 0x10000b
diff --git a/src/runtime/defs_windows_arm.go b/src/runtime/defs_windows_arm.go
index 049f5b613a..b275b0572a 100644
--- a/src/runtime/defs_windows_arm.go
+++ b/src/runtime/defs_windows_arm.go
@@ -16,9 +16,13 @@ const (
_DUPLICATE_SAME_ACCESS = 0x2
_THREAD_PRIORITY_HIGHEST = 0x2
- _SIGINT = 0x2
- _CTRL_C_EVENT = 0x0
- _CTRL_BREAK_EVENT = 0x1
+ _SIGINT = 0x2
+ _SIGTERM = 0xF
+ _CTRL_C_EVENT = 0x0
+ _CTRL_BREAK_EVENT = 0x1
+ _CTRL_CLOSE_EVENT = 0x2
+ _CTRL_LOGOFF_EVENT = 0x5
+ _CTRL_SHUTDOWN_EVENT = 0x6
_CONTEXT_CONTROL = 0x10001
_CONTEXT_FULL = 0x10007
diff --git a/src/runtime/os_windows.go b/src/runtime/os_windows.go
index 074ae0f40d..9540069e11 100644
--- a/src/runtime/os_windows.go
+++ b/src/runtime/os_windows.go
@@ -894,6 +894,8 @@ func ctrlhandler1(_type uint32) uint32 {
switch _type {
case _CTRL_C_EVENT, _CTRL_BREAK_EVENT:
s = _SIGINT
+ case _CTRL_CLOSE_EVENT, _CTRL_LOGOFF_EVENT, _CTRL_SHUTDOWN_EVENT:
+ s = _SIGTERM
default:
return 0
}
diff --git a/src/syscall/types_windows.go b/src/syscall/types_windows.go
index 0b839339d2..0349f3b180 100644
--- a/src/syscall/types_windows.go
+++ b/src/syscall/types_windows.go
@@ -176,8 +176,11 @@ const (
FILE_MAP_READ = 0x04
FILE_MAP_EXECUTE = 0x20
- CTRL_C_EVENT = 0
- CTRL_BREAK_EVENT = 1
+ CTRL_C_EVENT = 0
+ CTRL_BREAK_EVENT = 1
+ CTRL_CLOSE_EVENT = 2
+ CTRL_LOGOFF_EVENT = 5
+ CTRL_SHUTDOWN_EVENT = 6
)
const (