summaryrefslogtreecommitdiff
path: root/src/internal/poll/sendfile_bsd.go
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2020-05-07 21:34:54 -0700
committerIan Lance Taylor <iant@golang.org>2020-05-11 22:38:32 +0000
commit8c1db77a92b1d17d3fe07999c5f20602a2080be9 (patch)
tree02a85060a0f9d7621708f6795e783279022030f2 /src/internal/poll/sendfile_bsd.go
parent910fee4ed55f1e9fa1386377c40f0b1eac63ee3f (diff)
downloadgo-git-8c1db77a92b1d17d3fe07999c5f20602a2080be9.tar.gz
internal/poll, os: loop on EINTR
Historically we've assumed that we can install all signal handlers with the SA_RESTART flag set, and let the system restart slow functions if a signal is received. Therefore, we don't have to worry about EINTR. This is only partially true, and we've added EINTR checks already for connect, and open/read on Darwin, and sendfile on Solaris. Other cases have turned up in #36644, #38033, and #38836. Also, #20400 points out that when Go code is included in a C program, the C program may install its own signal handlers without SA_RESTART. In that case, Go code will see EINTR no matter what it does. So, go ahead and check for EINTR. We don't check in the syscall package; people using syscalls directly may want to check for EINTR themselves. But we do check for EINTR in the higher level APIs in os and net, and retry the system call if we see it. This change looks safe, but of course we may be missing some cases where we need to check for EINTR. As such cases turn up, we can add tests to runtime/testdata/testprogcgo/eintr.go, and fix the code. If there are any such cases, their handling after this change will be no worse than it is today. For #22838 Fixes #20400 Fixes #36644 Fixes #38033 Fixes #38836 Change-Id: I7e46ca8cafed0429c7a2386cc9edc9d9d47a6896 Reviewed-on: https://go-review.googlesource.com/c/go/+/232862 Run-TryBot: Ian Lance Taylor <iant@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Bryan C. Mills <bcmills@google.com>
Diffstat (limited to 'src/internal/poll/sendfile_bsd.go')
-rw-r--r--src/internal/poll/sendfile_bsd.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/internal/poll/sendfile_bsd.go b/src/internal/poll/sendfile_bsd.go
index 40ae3468b0..a24e41dcaa 100644
--- a/src/internal/poll/sendfile_bsd.go
+++ b/src/internal/poll/sendfile_bsd.go
@@ -35,6 +35,9 @@ func SendFile(dstFD *FD, src int, pos, remain int64) (int64, error) {
} else if n == 0 && err1 == nil {
break
}
+ if err1 == syscall.EINTR {
+ continue
+ }
if err1 == syscall.EAGAIN {
if err1 = dstFD.pd.waitWrite(dstFD.isFile); err1 == nil {
continue