Removed redundant Reset() calls on bufio.Reader/bufio.Writer/gzipWriter/flateWriter before returning them to the pool, since Reset() is immediately called after these instances are obtained from pool

This commit is contained in:
Aliaksandr Valialkin
2015-12-29 15:10:14 +02:00
parent e0568fa3fb
commit 95093e35cf
4 changed files with 4 additions and 12 deletions
-2
View File
@@ -1015,7 +1015,6 @@ func (c *HostClient) acquireWriter(conn net.Conn) *bufio.Writer {
}
func (c *HostClient) releaseWriter(bw *bufio.Writer) {
bw.Reset(nil)
c.writerPool.Put(bw)
}
@@ -1034,7 +1033,6 @@ func (c *HostClient) acquireReader(conn net.Conn) *bufio.Reader {
}
func (c *HostClient) releaseReader(br *bufio.Reader) {
br.Reset(nil)
c.readerPool.Put(br)
}
-2
View File
@@ -89,7 +89,6 @@ func acquireGzipWriter(w io.Writer, level int) *gzipWriter {
func releaseGzipWriter(zw *gzipWriter) {
zw.Close()
zw.Reset(nil)
zw.p.Put(zw)
}
@@ -133,7 +132,6 @@ func acquireFlateWriter(w io.Writer, level int) *flateWriter {
func releaseFlateWriter(zw *flateWriter) {
zw.Close()
zw.Reset(nil)
zw.p.Put(zw)
}
-2
View File
@@ -1407,7 +1407,6 @@ func acquireReader(ctx *RequestCtx) *bufio.Reader {
}
func releaseReader(s *Server, r *bufio.Reader) {
r.Reset(nil)
s.readerPool.Put(r)
}
@@ -1426,7 +1425,6 @@ func acquireWriter(ctx *RequestCtx) *bufio.Writer {
}
func releaseWriter(s *Server, w *bufio.Writer) {
w.Reset(nil)
s.writerPool.Put(w)
}
+4 -6
View File
@@ -26,12 +26,11 @@ func NewStreamReader(sw StreamWriter) io.Reader {
pr, pw := io.Pipe()
var bw *bufio.Writer
bwv := streamWriterBufPool.Get()
if bwv == nil {
v := streamWriterBufPool.Get()
if v == nil {
bw = bufio.NewWriter(pw)
bwv = bw
} else {
bw = bwv.(*bufio.Writer)
bw = v.(*bufio.Writer)
bw.Reset(pw)
}
@@ -46,8 +45,7 @@ func NewStreamReader(sw StreamWriter) io.Reader {
bw.Flush()
pw.Close()
bw.Reset(nil)
streamWriterBufPool.Put(bwv)
streamWriterBufPool.Put(bw)
}()
return pr