]> Cypherpunks repositories - gostls13.git/commitdiff
[release-branch.go1.13] runtime: ignore power notification error seen on Windows...
authorIan Lance Taylor <iant@golang.org>
Wed, 15 Jan 2020 14:38:16 +0000 (06:38 -0800)
committerIan Lance Taylor <iant@golang.org>
Thu, 16 Jan 2020 19:05:30 +0000 (19:05 +0000)
Updates #36557
Fixes #36575

Change-Id: Ia8125f382d5e14e5612da811268a58971cc9ac08
Reviewed-on: https://go-review.googlesource.com/c/go/+/214917
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Jason A. Donenfeld <Jason@zx2c4.com>
Reviewed-by: Austin Clements <austin@google.com>
(cherry picked from commit d2de9bd59c068c1bfcb4293de4286196dacf2e43)
Reviewed-on: https://go-review.googlesource.com/c/go/+/215002

src/runtime/os_windows.go

index 6897933e30589521ead18890490fbbc955eb168c..2cf81f61a922cd2fe7a2873c171b421f24c43c5e 100644 (file)
@@ -263,8 +263,9 @@ func loadOptionalSyscalls() {
 
 func monitorSuspendResume() {
        const (
-               _DEVICE_NOTIFY_CALLBACK = 2
-               _ERROR_FILE_NOT_FOUND   = 2
+               _DEVICE_NOTIFY_CALLBACK   = 2
+               _ERROR_FILE_NOT_FOUND     = 2
+               _ERROR_INVALID_PARAMETERS = 87
        )
        type _DEVICE_NOTIFY_SUBSCRIBE_PARAMETERS struct {
                callback uintptr
@@ -302,6 +303,10 @@ func monitorSuspendResume() {
                // also have their clock on "program time", and therefore
                // don't want or need this anyway.
                return
+       case _ERROR_INVALID_PARAMETERS:
+               // This is seen when running in Windows Docker.
+               // See issue 36557.
+               return
        default:
                println("runtime: PowerRegisterSuspendResumeNotification failed with errno=", ret)
                throw("runtime: PowerRegisterSuspendResumeNotification failure")