-
Notifications
You must be signed in to change notification settings - Fork 17.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[release-branch.go1.23] internal/poll: keep copying after successful …
…Sendfile return on BSD The BSD implementation of poll.SendFile incorrectly halted copying after succesfully writing one full chunk of data. Adjust the copy loop to match the Linux and Solaris implementations. In testing, empirically macOS appears to sometimes return EAGAIN from sendfile after successfully copying a full chunk. Add a check to all implementations to return nil after successfully copying all data if the last sendfile call returns EAGAIN. For #70000 For #70020 Change-Id: I57ba649491fc078c7330310b23e1cfd85135c8ff Reviewed-on: https://go-review.googlesource.com/c/go/+/622235 LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]> (cherry picked from commit bd388c0) Reviewed-on: https://go-review.googlesource.com/c/go/+/622696
- Loading branch information
Showing
5 changed files
with
171 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| // Copyright 2024 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. | ||
|
|
||
| package os_test | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "errors" | ||
| "io" | ||
| "math/rand/v2" | ||
| "net" | ||
| "os" | ||
| "runtime" | ||
| "sync" | ||
| "testing" | ||
|
|
||
| "golang.org/x/net/nettest" | ||
| ) | ||
|
|
||
| // Exercise sendfile/splice fast paths with a moderately large file. | ||
| // | ||
| // https://go.dev/issue/70000 | ||
|
|
||
| func TestLargeCopyViaNetwork(t *testing.T) { | ||
| const size = 10 * 1024 * 1024 | ||
| dir := t.TempDir() | ||
|
|
||
| src, err := os.Create(dir + "/src") | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| defer src.Close() | ||
| if _, err := io.CopyN(src, newRandReader(), size); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if _, err := src.Seek(0, 0); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| dst, err := os.Create(dir + "/dst") | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| defer dst.Close() | ||
|
|
||
| client, server := createSocketPair(t, "tcp") | ||
| var wg sync.WaitGroup | ||
| wg.Add(2) | ||
| go func() { | ||
| defer wg.Done() | ||
| if n, err := io.Copy(dst, server); n != size || err != nil { | ||
| t.Errorf("copy to destination = %v, %v; want %v, nil", n, err, size) | ||
| } | ||
| }() | ||
| go func() { | ||
| defer wg.Done() | ||
| defer client.Close() | ||
| if n, err := io.Copy(client, src); n != size || err != nil { | ||
| t.Errorf("copy from source = %v, %v; want %v, nil", n, err, size) | ||
| } | ||
| }() | ||
| wg.Wait() | ||
|
|
||
| if _, err := dst.Seek(0, 0); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if err := compareReaders(dst, io.LimitReader(newRandReader(), size)); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| } | ||
|
|
||
| func compareReaders(a, b io.Reader) error { | ||
| bufa := make([]byte, 4096) | ||
| bufb := make([]byte, 4096) | ||
| for { | ||
| na, erra := io.ReadFull(a, bufa) | ||
| if erra != nil && erra != io.EOF { | ||
| return erra | ||
| } | ||
| nb, errb := io.ReadFull(b, bufb) | ||
| if errb != nil && errb != io.EOF { | ||
| return errb | ||
| } | ||
| if !bytes.Equal(bufa[:na], bufb[:nb]) { | ||
| return errors.New("contents mismatch") | ||
| } | ||
| if erra == io.EOF && errb == io.EOF { | ||
| break | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| type randReader struct { | ||
| rand *rand.Rand | ||
| } | ||
|
|
||
| func newRandReader() *randReader { | ||
| return &randReader{rand.New(rand.NewPCG(0, 0))} | ||
| } | ||
|
|
||
| func (r *randReader) Read(p []byte) (int, error) { | ||
| var v uint64 | ||
| var n int | ||
| for i := range p { | ||
| if n == 0 { | ||
| v = r.rand.Uint64() | ||
| n = 8 | ||
| } | ||
| p[i] = byte(v & 0xff) | ||
| v >>= 8 | ||
| n-- | ||
| } | ||
| return len(p), nil | ||
| } | ||
|
|
||
| func createSocketPair(t *testing.T, proto string) (client, server net.Conn) { | ||
| t.Helper() | ||
| if !nettest.TestableNetwork(proto) { | ||
| t.Skipf("%s does not support %q", runtime.GOOS, proto) | ||
| } | ||
|
|
||
| ln, err := nettest.NewLocalListener(proto) | ||
| if err != nil { | ||
| t.Fatalf("NewLocalListener error: %v", err) | ||
| } | ||
| t.Cleanup(func() { | ||
| if ln != nil { | ||
| ln.Close() | ||
| } | ||
| if client != nil { | ||
| client.Close() | ||
| } | ||
| if server != nil { | ||
| server.Close() | ||
| } | ||
| }) | ||
| ch := make(chan struct{}) | ||
| go func() { | ||
| var err error | ||
| server, err = ln.Accept() | ||
| if err != nil { | ||
| t.Errorf("Accept new connection error: %v", err) | ||
| } | ||
| ch <- struct{}{} | ||
| }() | ||
| client, err = net.Dial(proto, ln.Addr().String()) | ||
| <-ch | ||
| if err != nil { | ||
| t.Fatalf("Dial new connection error: %v", err) | ||
| } | ||
| return client, server | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters