dlss
/
FedP2P
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bencode: Unembed the Reader type, and minimize the interface surface 

Want to remove some unnecessary allocations.
This commit is contained in:
Matt Joiner 2016-06-15 14:51:58 +10:00
parent 9e0cae9113
commit 9d1a33facc
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bencode/api.go
View File

@ -128,7 +128,7 @@ func Marshal(v interface{}) ([]byte, error) {
// Unmarshal the bencode value in the 'data' to a value pointed by the 'v'
// pointer, return a non-nil error if any.
func Unmarshal(data []byte, v interface{}) error {
e := decoder{Reader: bufio.NewReader(bytes.NewBuffer(data))}
e := decoder{r: bufio.NewReader(bytes.NewBuffer(data))}
return e.decode(v)
}
@ -141,7 +141,7 @@ type Decoder struct {
}
func NewDecoder(r io.Reader) *Decoder {
return &Decoder{decoder{Reader: bufio.NewReader(r)}}
return &Decoder{decoder{r: bufio.NewReader(r)}}
}
func (d *Decoder) Decode(v interface{}) error {

22
bencode/decode.go
View File

@ -1,7 +1,6 @@
package bencode
import (
"bufio"
"bytes"
"errors"
"fmt"
@ -14,7 +13,10 @@ import (
)
type decoder struct {
*bufio.Reader
r interface {
io.ByteScanner
io.Reader
}
offset int64
buf bytes.Buffer
key string
@ -51,7 +53,7 @@ func check_for_unexpected_eof(err error, offset int64) {
}
func (d *decoder) read_byte() byte {
b, err := d.ReadByte()
b, err := d.r.ReadByte()
if err != nil {
check_for_unexpected_eof(err, d.offset)
panic(err)
@ -145,7 +147,7 @@ func (d *decoder) parse_string(v reflect.Value) {
check_for_int_parse_error(err, start)
d.buf.Reset()
n, err := io.CopyN(&d.buf, d, length)
n, err := io.CopyN(&d.buf, d.r, length)
d.offset += n
if err != nil {
check_for_unexpected_eof(err, d.offset)
@ -329,12 +331,12 @@ func (d *decoder) parse_list(v reflect.Value) {
}
func (d *decoder) read_one_value() bool {
b, err := d.ReadByte()
b, err := d.r.ReadByte()
if err != nil {
panic(err)
}
if b == 'e' {
d.UnreadByte()
d.r.UnreadByte()
return false
} else {
d.offset++
@ -360,7 +362,7 @@ func (d *decoder) read_one_value() bool {
check_for_int_parse_error(err, d.offset-1)
d.buf.WriteString(":")
n, err := io.CopyN(&d.buf, d, length)
n, err := io.CopyN(&d.buf, d.r, length)
d.offset += n
if err != nil {
check_for_unexpected_eof(err, d.offset)
@ -429,7 +431,7 @@ func (d *decoder) parse_value(v reflect.Value) bool {
return true
}
b, err := d.ReadByte()
b, err := d.r.ReadByte()
if err != nil {
panic(err)
}
@ -468,7 +470,7 @@ func (d *decoder) raiseUnknownValueType(b byte, offset int64) {
}
func (d *decoder) parse_value_interface() (interface{}, bool) {
b, err := d.ReadByte()
b, err := d.r.ReadByte()
if err != nil {
panic(err)
}
@ -535,7 +537,7 @@ func (d *decoder) parse_string_interface() interface{} {
check_for_int_parse_error(err, start)
d.buf.Reset()
n, err := io.CopyN(&d.buf, d, length)
n, err := io.CopyN(&d.buf, d.r, length)
d.offset += n
if err != nil {
check_for_unexpected_eof(err, d.offset)