Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use sync.Pool to reduce lengthReader allocations #5848

Merged
merged 3 commits into from
Oct 16, 2023
+20 −1
Merged

Use sync.Pool to reduce lengthReader allocations #5848

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3edc716
Use sync.Pool to reduce lengthReader allocations
perhapsmaple Oct 2, 2023
2c9d8eb
Add defer putLengthReader to prevent leak
perhapsmaple Oct 2, 2023
d74e227
Cleanup in putLengthReader
perhapsmaple Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion modules/caddyhttp/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,8 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// so we can track the number of bytes read from it
var bodyReader *lengthReader
if r.Body != nil {
bodyReader = &lengthReader{Source: r.Body}
bodyReader = getLengthReader(r.Body)
francislavoie marked this conversation as resolved.
Show resolved Hide resolved
defer putLengthReader(bodyReader)
r.Body = bodyReader
}

Expand Down Expand Up @@ -911,6 +912,24 @@ type lengthReader struct {
Length int
}

var lengthReaderPool = sync.Pool{
New: func() interface{} {
return &lengthReader{}
},
}

func getLengthReader(source io.ReadCloser) *lengthReader {
reader := lengthReaderPool.Get().(*lengthReader)
reader.Source = source
return reader
}

func putLengthReader(reader *lengthReader) {
reader.Source = nil
reader.Length = 0
lengthReaderPool.Put(reader)
}

func (r *lengthReader) Read(b []byte) (int, error) {
n, err := r.Source.Read(b)
r.Length += n
Expand Down
Loading