From 2f3b6022858aab2d70e380d126e6dcec227c0d38 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Sun, 20 Mar 2016 23:25:11 -0400 Subject: [PATCH] Optimizations for StdWriter Avoids allocations and copying by using a buffer pool for intermediate writes. ``` benchmark old ns/op new ns/op delta BenchmarkWrite-8 996 175 -82.43% benchmark old MB/s new MB/s speedup BenchmarkWrite-8 4414.48 25069.46 5.68x benchmark old allocs new allocs delta BenchmarkWrite-8 2 0 -100.00% benchmark old bytes new bytes delta BenchmarkWrite-8 4616 0 -100.00% ``` Signed-off-by: Brian Goff --- pkg/stdcopy/stdcopy.go | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkg/stdcopy/stdcopy.go b/pkg/stdcopy/stdcopy.go index b37ae39f8e..8f67ece949 100644 --- a/pkg/stdcopy/stdcopy.go +++ b/pkg/stdcopy/stdcopy.go @@ -1,10 +1,12 @@ package stdcopy import ( + "bytes" "encoding/binary" "errors" "fmt" "io" + "sync" "github.com/Sirupsen/logrus" ) @@ -28,6 +30,8 @@ const ( startingBufLen = 32*1024 + stdWriterPrefixLen + 1 ) +var bufPool = &sync.Pool{New: func() interface{} { return bytes.NewBuffer(nil) }} + // stdWriter is wrapper of io.Writer with extra customized info. type stdWriter struct { io.Writer @@ -35,28 +39,31 @@ type stdWriter struct { } // Write sends the buffer to the underneath writer. -// It insert the prefix header before the buffer, +// It inserts the prefix header before the buffer, // so stdcopy.StdCopy knows where to multiplex the output. // It makes stdWriter to implement io.Writer. -func (w *stdWriter) Write(buf []byte) (n int, err error) { +func (w *stdWriter) Write(p []byte) (n int, err error) { if w == nil || w.Writer == nil { return 0, errors.New("Writer not instantiated") } - if buf == nil { + if p == nil { return 0, nil } header := [stdWriterPrefixLen]byte{stdWriterFdIndex: w.prefix} - binary.BigEndian.PutUint32(header[stdWriterSizeIndex:], uint32(len(buf))) + binary.BigEndian.PutUint32(header[stdWriterSizeIndex:], uint32(len(p))) + buf := bufPool.Get().(*bytes.Buffer) + buf.Write(header[:]) + buf.Write(p) - line := append(header[:], buf...) - - n, err = w.Writer.Write(line) + n, err = w.Writer.Write(buf.Bytes()) n -= stdWriterPrefixLen - if n < 0 { n = 0 } + + buf.Reset() + bufPool.Put(buf) return }