Use drained legacy pool in goleveldb

Godeps/Godeps.json

@@ -49,7 +49,7 @@
 		},
 		{
 			"ImportPath": "github.com/syndtr/goleveldb/leveldb",
-			"Rev": "a44c00531ccc005546f20c6e00ab7bb9a8f6b2e0"
+			"Rev": "17fd8940e0f778c27793a25bff8c48ddd7bf53ac"
 		},
 		{
 			"ImportPath": "github.com/vitrun/qart/coding",

Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/buffer_pool.go

@@ -1,128 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// +build go1.3
-
-package util
-
-import (
-	"fmt"
-	"sync"
-	"sync/atomic"
-)
-
-type buffer struct {
-	b    []byte
-	miss int
-}
-
-// BufferPool is a 'buffer pool'.
-type BufferPool struct {
-	pool      [4]sync.Pool
-	size      [3]uint32
-	sizeMiss  [3]uint32
-	baseline0 int
-	baseline1 int
-	baseline2 int
-
-	less    uint32
-	equal   uint32
-	greater uint32
-	miss    uint32
-}
-
-func (p *BufferPool) poolNum(n int) int {
-	switch {
-	case n <= p.baseline0:
-		return 0
-	case n <= p.baseline1:
-		return 1
-	case n <= p.baseline2:
-		return 2
-	default:
-		return 3
-	}
-}
-
-// Get returns buffer with length of n.
-func (p *BufferPool) Get(n int) []byte {
-	if poolNum := p.poolNum(n); poolNum == 0 {
-		// Fast path.
-		if b, ok := p.pool[0].Get().([]byte); ok {
-			switch {
-			case cap(b) > n:
-				atomic.AddUint32(&p.less, 1)
-				return b[:n]
-			case cap(b) == n:
-				atomic.AddUint32(&p.equal, 1)
-				return b[:n]
-			default:
-				panic("not reached")
-			}
-		} else {
-			atomic.AddUint32(&p.miss, 1)
-		}
-
-		return make([]byte, n, p.baseline0)
-	} else {
-		sizePtr := &p.size[poolNum-1]
-
-		if b, ok := p.pool[poolNum].Get().([]byte); ok {
-			switch {
-			case cap(b) > n:
-				atomic.AddUint32(&p.less, 1)
-				return b[:n]
-			case cap(b) == n:
-				atomic.AddUint32(&p.equal, 1)
-				return b[:n]
-			default:
-				atomic.AddUint32(&p.greater, 1)
-				if uint32(cap(b)) >= atomic.LoadUint32(sizePtr) {
-					p.pool[poolNum].Put(b)
-				}
-			}
-		} else {
-			atomic.AddUint32(&p.miss, 1)
-		}
-
-		if size := atomic.LoadUint32(sizePtr); uint32(n) > size {
-			if size == 0 {
-				atomic.CompareAndSwapUint32(sizePtr, 0, uint32(n))
-			} else {
-				sizeMissPtr := &p.sizeMiss[poolNum-1]
-				if atomic.AddUint32(sizeMissPtr, 1) == 20 {
-					atomic.StoreUint32(sizePtr, uint32(n))
-					atomic.StoreUint32(sizeMissPtr, 0)
-				}
-			}
-			return make([]byte, n)
-		} else {
-			return make([]byte, n, size)
-		}
-	}
-}
-
-// Put adds given buffer to the pool.
-func (p *BufferPool) Put(b []byte) {
-	p.pool[p.poolNum(cap(b))].Put(b)
-}
-
-func (p *BufferPool) String() string {
-	return fmt.Sprintf("BufferPool{B·%d Z·%v Zm·%v L·%d E·%d G·%d M·%d}",
-		p.baseline0, p.size, p.sizeMiss, p.less, p.equal, p.greater, p.miss)
-}
-
-// NewBufferPool creates a new initialized 'buffer pool'.
-func NewBufferPool(baseline int) *BufferPool {
-	if baseline <= 0 {
-		panic("baseline can't be <= 0")
-	}
-	return &BufferPool{
-		baseline0: baseline,
-		baseline1: baseline * 2,
-		baseline2: baseline * 4,
-	}
-}

Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/buffer_pool_legacy.go

@@ -4,13 +4,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// +build !go1.3
-
 package util
 
 import (
 	"fmt"
 	"sync/atomic"
+	"time"
 )
 
 type buffer struct {
@@ -126,6 +125,19 @@ func (p *BufferPool) String() string {
 		p.baseline0, p.size, p.sizeMiss, p.less, p.equal, p.greater, p.miss)
 }
 
+func (p *BufferPool) drain() {
+	for {
+		time.Sleep(1 * time.Second)
+		select {
+		case <-p.pool[0]:
+		case <-p.pool[1]:
+		case <-p.pool[2]:
+		case <-p.pool[3]:
+		default:
+		}
+	}
+}
+
 // NewBufferPool creates a new initialized 'buffer pool'.
 func NewBufferPool(baseline int) *BufferPool {
 	if baseline <= 0 {
@@ -139,5 +151,6 @@ func NewBufferPool(baseline int) *BufferPool {
 	for i, cap := range []int{6, 6, 3, 1} {
 		p.pool[i] = make(chan []byte, cap)
 	}
+	go p.drain()
 	return p
 }