caddyhttp: Use sync.Pool to reduce lengthReader allocations (#5848)

* Use sync.Pool to reduce lengthReader allocations

Signed-off-by: Harish Shan <140232061+perhapsmaple@users.noreply.github.com>

* Add defer putLengthReader to prevent leak

Signed-off-by: Harish Shan <140232061+perhapsmaple@users.noreply.github.com>

* Cleanup in putLengthReader

Co-authored-by: Francis Lavoie <lavofr@gmail.com>

---------

Signed-off-by: Harish Shan <140232061+perhapsmaple@users.noreply.github.com>
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
This commit is contained in:
Harish Shan 2023-10-17 02:12:01 +05:30 committed by GitHub
parent 24b0ecc310
commit c8559c4485
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -318,7 +318,8 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// so we can track the number of bytes read from it // so we can track the number of bytes read from it
var bodyReader *lengthReader var bodyReader *lengthReader
if r.Body != nil { if r.Body != nil {
bodyReader = &lengthReader{Source: r.Body} bodyReader = getLengthReader(r.Body)
defer putLengthReader(bodyReader)
r.Body = bodyReader r.Body = bodyReader
} }
@ -902,6 +903,24 @@ type lengthReader struct {
Length int 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) { func (r *lengthReader) Read(b []byte) (int, error) {
n, err := r.Source.Read(b) n, err := r.Source.Read(b)
r.Length += n r.Length += n