Skip to content

⚡ Bolt: Optimize decodeAddr in proc/net to eliminate allocations #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
blue4209211 wants to merge 1 commit into from
Closed

⚡ Bolt: Optimize decodeAddr in proc/net to eliminate allocations #188

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 27 additions & 16 deletions proc/net.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"bytes"
"encoding/binary"
"encoding/hex"
"net"
"os"

"inet.af/netaddr"
Expand Down Expand Up @@ -90,27 +89,39 @@ func nextField(s []byte) ([]byte, []byte) {

func decodeAddr(src []byte) netaddr.IPPort {
col := bytes.IndexByte(src, ':')
if col == -1 || (col != 8 && col != 32) {
if col == -1 {
return netaddr.IPPort{}
}
ip := make([]byte, col/2)
if _, err := hex.Decode(ip, src[:col]); err != nil {
return netaddr.IPPort{}
}
port := make([]byte, 2)
if _, err := hex.Decode(port, src[col+1:]); err != nil {

var ip [16]byte
var ipp netaddr.IP
if col == 8 {
if _, err := hex.Decode(ip[:4], src[:8]); err != nil {
return netaddr.IPPort{}
}
v := binary.BigEndian.Uint32(ip[:4])
binary.LittleEndian.PutUint32(ip[:4], v)
ipp = netaddr.IPv4(ip[0], ip[1], ip[2], ip[3])
} else if col == 32 {
if _, err := hex.Decode(ip[:], src[:32]); err != nil {
return netaddr.IPPort{}
}
for i := 0; i < 16; i += 4 {
v := binary.BigEndian.Uint32(ip[i : i+4])
binary.LittleEndian.PutUint32(ip[i:i+4], v)
}
ipp = netaddr.IPFrom16(ip)
} else {
return netaddr.IPPort{}
}

var v uint32
for i := 0; i < len(ip); i += 4 {
v = binary.BigEndian.Uint32(ip[i : i+4])
binary.LittleEndian.PutUint32(ip[i:i+4], v)
if len(src) < col+1+4 {
return netaddr.IPPort{}
}

ipp, ok := netaddr.FromStdIP(net.IP(ip))
if !ok {
var port [2]byte
if _, err := hex.Decode(port[:], src[col+1:col+1+4]); err != nil {
return netaddr.IPPort{}
}
return netaddr.IPPortFrom(ipp, binary.BigEndian.Uint16(port))

return netaddr.IPPortFrom(ipp, binary.BigEndian.Uint16(port[:]))
}
Loading