vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #21356 from cpuguy83/stdcopy_allocs

Browse source 
Optimizations for StdWriter
This commit is contained in:
Alexander Morozov 2016-03-31 10:54:45 -07:00
commit 528b87b0bc
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
stdcopy/stdcopy.go
View file

@ -1,10 +1,12 @@
package stdcopy package stdcopy
import ( import (
"bytes"
"encoding/binary" "encoding/binary"
"errors" "errors"
"fmt" "fmt"
"io" "io"
"sync"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
) )
@ -28,6 +30,8 @@ const (
startingBufLen = 32*1024 + stdWriterPrefixLen + 1 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. // stdWriter is wrapper of io.Writer with extra customized info.
type stdWriter struct { type stdWriter struct {
io.Writer io.Writer
@ -35,28 +39,31 @@ type stdWriter struct {
} }
// Write sends the buffer to the underneath writer. // 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. // so stdcopy.StdCopy knows where to multiplex the output.
// It makes stdWriter to implement io.Writer. // 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 { if w == nil || w.Writer == nil {
return 0, errors.New("Writer not instantiated") return 0, errors.New("Writer not instantiated")
} }
if buf == nil { if p == nil {
return 0, nil return 0, nil
} }
header := [stdWriterPrefixLen]byte{stdWriterFdIndex: w.prefix} 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(buf.Bytes())
n, err = w.Writer.Write(line)
n -= stdWriterPrefixLen n -= stdWriterPrefixLen
if n < 0 { if n < 0 {
n = 0 n = 0
} }
buf.Reset()
bufPool.Put(buf)
return return
} }