Merge pull request #3 from shanson7/reduceAllocs

Reduce allocs by pooling gzip.Writer objects

Author: woodsaj

gzip.go

@@ -23,6 +23,7 @@ import (
 	"net"
 	"net/http"
 	"strings"
+	"sync"
 
 	"github.com/klauspost/compress/gzip"
 	"gopkg.in/macaron.v1"
@@ -42,6 +43,32 @@ type nopCloser struct {
 
 func (nopCloser) Close() error { return nil }
 
+type WriterPool struct {
+	pool sync.Pool
+}
+
+func NewWriterPool() *WriterPool {
+	return &WriterPool{pool: sync.Pool{
+		New: func() interface{} { return nil },
+	}}
+}
+
+func (wp *WriterPool) Get(rw macaron.ResponseWriter) *gzip.Writer {
+	ret := wp.pool.Get()
+	if ret == nil {
+		ret = gzip.NewWriter(rw)
+	} else {
+		ret.(*gzip.Writer).Reset(rw)
+	}
+	return ret.(*gzip.Writer)
+}
+
+func (wp *WriterPool) Put(w *gzip.Writer) {
+	wp.pool.Put(w)
+}
+
+var writerPool WriterPool
+
 /*
   Gzip middleware inspired by https://github.com/go-macaron/gzip
 
@@ -97,7 +124,7 @@ func (grw *gzipResponseWriter) setup() {
 		headers := grw.Header()
 		headers.Set(_HEADER_CONTENT_ENCODING, "gzip")
 		headers.Set(_HEADER_VARY, _HEADER_ACCEPT_ENCODING)
-		grw.w = gzip.NewWriter(grw.ResponseWriter)
+		grw.w = writerPool.Get(grw.ResponseWriter)
 	}
 }
 
@@ -107,6 +134,12 @@ func (grw *gzipResponseWriter) close() {
 		return
 	}
 	grw.w.Close()
+
+	if poolWriter, ok := grw.w.(*gzip.Writer); ok {
+		writerPool.Put(poolWriter)
+	}
+
+	grw.w = nil
 }
 
 func (grw *gzipResponseWriter) Write(p []byte) (int, error) {

gzip_test.go

@@ -162,3 +162,24 @@ func Test_GzipPanic(t *testing.T) {
 		So(before, ShouldBeTrue)
 	})
 }
+
+func BenchmarkGzip(b *testing.B) {
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	m := macaron.New()
+	m.Use(Gziper())
+	m.Get("/", func() string { return "hello world!" })
+
+	for n := 0; n < b.N; n++ {
+		resp := httptest.NewRecorder()
+		req, err := http.NewRequest("GET", "/", nil)
+		if err != nil {
+			b.Error("Unexpected error = ", err)
+		}
+
+		resp = httptest.NewRecorder()
+		req.Header.Set(_HEADER_ACCEPT_ENCODING, "gzip")
+		m.ServeHTTP(resp, req)
+	}
+}