fix benchmark

Author: Equim-chan

decode.go

@@ -61,13 +61,12 @@ func DecodeString(s string) []byte {
 type decoder struct {
 	// input
 	reader io.Reader
+	err    error
 
 	outBuf []byte
 	inBuf  *[1024]byte
 	nInBuf int
 
-	err error
-
 	b, n uint32
 	v    int
 }
@@ -77,13 +76,15 @@ type decoder struct {
 func NewDecoder(r io.Reader) io.Reader {
 	return &decoder{
 		reader: r,
+		err:    nil,
+
 		outBuf: []byte{},
 		inBuf:  new([1024]byte),
 		nInBuf: 0,
-		err:    nil,
-		b:      0,
-		n:      0,
-		v:      -1,
+
+		b: 0,
+		n: 0,
+		v: -1,
 	}
 }
 
@@ -128,7 +129,7 @@ func (d *decoder) Read(c []byte) (int, error) {
 			d.v = -1
 		}
 
-		if d.nInBuf == 1024 {
+		if d.nInBuf >= 1024 {
 			d.nInBuf = 0
 		}
 

decode_test.go

@@ -61,18 +61,15 @@ func BenchmarkDecoder(b *testing.B) {
 	}
 
 	encoded := EncodeToString(s)
-	size := int64(len(encoded))
+	b.SetBytes(int64(len(encoded)))
 
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
 		d := NewDecoder(strings.NewReader(encoded))
 
-		if n, err := io.CopyN(ioutil.Discard, d, 1024*1024); err != nil {
-			b.Log(n)
-			b.Log(size)
+		if _, err := io.CopyN(ioutil.Discard, d, 1024*1024); err != nil {
 			b.Fatal(err)
 		}
 
-		b.SetBytes(size)
 	}
 }

encode_test.go

@@ -56,6 +56,8 @@ func BenchmarkEncode(b *testing.B) {
 func BenchmarkEncoder(b *testing.B) {
 	buf := new(bytes.Buffer)
 	buf.Grow(1024 * 1024)
+	b.SetBytes(1024 * 1024)
+
 	e := NewEncoder(buf)
 	defer e.Close()
 
@@ -65,6 +67,5 @@ func BenchmarkEncoder(b *testing.B) {
 			b.Fatal(err)
 		}
 
-		b.SetBytes(1024 * 1024)
 	}
 }