Improve benchmarks

License: MIT
Signed-off-by: Jakub Sztandera <[email protected]>

buzhash.go

@@ -28,6 +28,10 @@ func NewBuzhash(r io.Reader) *Buzhash {
 	}
 }
 
+func (b *Buzhash) Reader() io.Reader {
+	return b.r
+}
+
 func (b *Buzhash) NextBytes() ([]byte, error) {
 	if b.err != nil {
 		return nil, b.err

buzhash_test.go

@@ -41,37 +41,16 @@ func TestBuzhashChunking(t *testing.T) {
 }
 
 func TestBuzhashChunkReuse(t *testing.T) {
-	newBuzhash := func(r io.Reader) cher {
+	newBuzhash := func(r io.Reader) Splitter {
 		return NewBuzhash(r)
 	}
 	testReuse(t, newBuzhash)
 }
 
-func BenchmarkBuzhash(b *testing.B) {
-	data := make([]byte, 1<<10)
-	util.NewTimeSeededRand().Read(data)
-
-	b.SetBytes(int64(len(data)))
-	b.ReportAllocs()
-	b.ResetTimer()
-
-	var res uint64
-
-	for i := 0; i < b.N; i++ {
-		r := NewBuzhash(bytes.NewReader(data))
-
-		for {
-			chunk, err := r.NextBytes()
-			if err != nil {
-				if err == io.EOF {
-					break
-				}
-				b.Fatal(err)
-			}
-			res = res + uint64(len(chunk))
-		}
-	}
-	Res = Res + res
+func BenchmarkBuzhash2(b *testing.B) {
+	benchmarkChunker(b, func(r io.Reader) Splitter {
+		return NewBuzhash(r)
+	})
 }
 
 func TestBuzhashBitsHash(t *testing.T) {

rabin_test.go

@@ -39,13 +39,7 @@ func TestRabinChunking(t *testing.T) {
 	}
 }
 
-type cher interface {
-	NextBytes() ([]byte, error)
-}
-
-type newChunker func(io.Reader) cher
-
-func chunkData(t *testing.T, newC newChunker, data []byte) map[string]blocks.Block {
+func chunkData(t *testing.T, newC newSplitter, data []byte) map[string]blocks.Block {
 	r := newC(bytes.NewReader(data))
 
 	blkmap := make(map[string]blocks.Block)
@@ -66,7 +60,7 @@ func chunkData(t *testing.T, newC newChunker, data []byte) map[string]blocks.Blo
 	return blkmap
 }
 
-func testReuse(t *testing.T, cr newChunker) {
+func testReuse(t *testing.T, cr newSplitter) {
 	data := make([]byte, 1024*1024*16)
 	util.NewTimeSeededRand().Read(data)
 
@@ -87,7 +81,7 @@ func testReuse(t *testing.T, cr newChunker) {
 }
 
 func TestRabinChunkReuse(t *testing.T) {
-	newRabin := func(r io.Reader) cher {
+	newRabin := func(r io.Reader) Splitter {
 		return NewRabin(r, 256*1024)
 	}
 	testReuse(t, newRabin)
@@ -96,29 +90,7 @@ func TestRabinChunkReuse(t *testing.T) {
 var Res uint64
 
 func BenchmarkRabin(b *testing.B) {
-	const size = 1 << 10
-	data := make([]byte, size)
-	util.NewTimeSeededRand().Read(data)
-
-	b.SetBytes(size)
-	b.ReportAllocs()
-	b.ResetTimer()
-
-	var res uint64
-
-	for i := 0; i < b.N; i++ {
-		r := NewRabin(bytes.NewReader(data), 1024*256)
-
-		for {
-			chunk, err := r.NextBytes()
-			if err != nil {
-				if err == io.EOF {
-					break
-				}
-				b.Fatal(err)
-			}
-			res = res + uint64(len(chunk))
-		}
-	}
-	Res = Res + res
+	benchmarkChunker(b, func(r io.Reader) Splitter {
+		return NewRabin(r, 256<<10)
+	})
 }

splitting_test.go

@@ -6,7 +6,6 @@ import (
 	"testing"
 
 	u "github.com/ipfs/go-ipfs-util"
-	util "github.com/ipfs/go-ipfs-util"
 )
 
 func randBuf(t *testing.T, size int) []byte {
@@ -121,29 +120,7 @@ func (s *clipReader) Read(buf []byte) (int, error) {
 }
 
 func BenchmarkDefault(b *testing.B) {
-	const size = 1 << 10
-	data := make([]byte, size)
-	util.NewTimeSeededRand().Read(data)
-
-	b.SetBytes(size)
-	b.ReportAllocs()
-	b.ResetTimer()
-
-	var res uint64
-
-	for i := 0; i < b.N; i++ {
-		r := DefaultSplitter(bytes.NewReader(data))
-
-		for {
-			chunk, err := r.NextBytes()
-			if err != nil {
-				if err == io.EOF {
-					break
-				}
-				b.Fatal(err)
-			}
-			res = res + uint64(len(chunk))
-		}
-	}
-	Res = Res + res
+	benchmarkChunker(b, func(r io.Reader) Splitter {
+		return DefaultSplitter(r)
+	})
 }