qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-13 17:30:24 -07:00
Code Releases Activity

internal/poll: re-use RawSockaddrAny buffers across requests on windows

Browse Source 
We were re-allocating a new RawSockaddrAny on every UDP read/write.
We can re-use them instead.

This reduces the number of allocs for UDP read/write on windows to zero.

Co-authored-by: David Crawshaw <crawshaw@golang.org>
Change-Id: I2f05c974e2e7b4f67937ae4e1c99583e81d140af
Reviewed-on: https://go-review.googlesource.com/c/go/+/361404
Trust: Josh Bleecher Snyder <josharian@gmail.com>
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Josh Bleecher Snyder 2021-11-04 12:19:04 -07:00
parent 8ad0a7e785
commit 1e0c3b2877
1 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/internal/poll/fd_windows.go
View File

@ -1116,25 +1116,27 @@ func (fd *FD) RawWrite(f func(uintptr) bool) error {
return syscall.EWINDOWS return syscall.EWINDOWS
} }
func sockaddrInet4ToRaw(sa *syscall.SockaddrInet4) (unsafe.Pointer, int32) { func sockaddrInet4ToRaw(rsa *syscall.RawSockaddrAny, sa *syscall.SockaddrInet4) int32 {
var raw syscall.RawSockaddrInet4 *rsa = syscall.RawSockaddrAny{}
raw := (*syscall.RawSockaddrInet4)(unsafe.Pointer(rsa))
raw.Family = syscall.AF_INET raw.Family = syscall.AF_INET
p := (*[2]byte)(unsafe.Pointer(&raw.Port)) p := (*[2]byte)(unsafe.Pointer(&raw.Port))
p[0] = byte(sa.Port >> 8) p[0] = byte(sa.Port >> 8)
p[1] = byte(sa.Port) p[1] = byte(sa.Port)
raw.Addr = sa.Addr raw.Addr = sa.Addr
return unsafe.Pointer(&raw), int32(unsafe.Sizeof(raw)) return int32(unsafe.Sizeof(*raw))
} }
func sockaddrInet6ToRaw(sa *syscall.SockaddrInet6) (unsafe.Pointer, int32) { func sockaddrInet6ToRaw(rsa *syscall.RawSockaddrAny, sa *syscall.SockaddrInet6) int32 {
var raw syscall.RawSockaddrInet6 *rsa = syscall.RawSockaddrAny{}
raw := (*syscall.RawSockaddrInet6)(unsafe.Pointer(rsa))
raw.Family = syscall.AF_INET6 raw.Family = syscall.AF_INET6
p := (*[2]byte)(unsafe.Pointer(&raw.Port)) p := (*[2]byte)(unsafe.Pointer(&raw.Port))
p[0] = byte(sa.Port >> 8) p[0] = byte(sa.Port >> 8)
p[1] = byte(sa.Port) p[1] = byte(sa.Port)
raw.Scope_id = sa.ZoneId raw.Scope_id = sa.ZoneId
raw.Addr = sa.Addr raw.Addr = sa.Addr
return unsafe.Pointer(&raw), int32(unsafe.Sizeof(raw)) return int32(unsafe.Sizeof(*raw))
} }
func rawToSockaddrInet4(rsa *syscall.RawSockaddrAny, sa *syscall.SockaddrInet4) { func rawToSockaddrInet4(rsa *syscall.RawSockaddrAny, sa *syscall.SockaddrInet4) {
@ -1152,16 +1154,16 @@ func rawToSockaddrInet6(rsa *syscall.RawSockaddrAny, sa *syscall.SockaddrInet6)
sa.Addr = pp.Addr sa.Addr = pp.Addr
} }
func sockaddrToRaw(sa syscall.Sockaddr) (unsafe.Pointer, int32, error) { func sockaddrToRaw(rsa *syscall.RawSockaddrAny, sa syscall.Sockaddr) (int32, error) {
switch sa := sa.(type) { switch sa := sa.(type) {
case *syscall.SockaddrInet4: case *syscall.SockaddrInet4:
ptr, sz := sockaddrInet4ToRaw(sa) sz := sockaddrInet4ToRaw(rsa, sa)
return ptr, sz, nil return sz, nil
case *syscall.SockaddrInet6: case *syscall.SockaddrInet6:
ptr, sz := sockaddrInet6ToRaw(sa) sz := sockaddrInet6ToRaw(rsa, sa)
return ptr, sz, nil return sz, nil
default: default:
return nil, 0, syscall.EWINDOWS return 0, syscall.EWINDOWS
} }
} }
@ -1178,7 +1180,9 @@ func (fd *FD) ReadMsg(p []byte, oob []byte, flags int) (int, int, int, syscall.S
o := &fd.rop o := &fd.rop
o.InitMsg(p, oob) o.InitMsg(p, oob)
o.rsa = new(syscall.RawSockaddrAny) if o.rsa == nil {
o.rsa = new(syscall.RawSockaddrAny)
}
o.msg.Name = (syscall.Pointer)(unsafe.Pointer(o.rsa)) o.msg.Name = (syscall.Pointer)(unsafe.Pointer(o.rsa))
o.msg.Namelen = int32(unsafe.Sizeof(*o.rsa)) o.msg.Namelen = int32(unsafe.Sizeof(*o.rsa))
o.msg.Flags = uint32(flags) o.msg.Flags = uint32(flags)
@ -1206,7 +1210,9 @@ func (fd *FD) ReadMsgInet4(p []byte, oob []byte, flags int, sa4 *syscall.Sockadd
o := &fd.rop o := &fd.rop
o.InitMsg(p, oob) o.InitMsg(p, oob)
o.rsa = new(syscall.RawSockaddrAny) if o.rsa == nil {
o.rsa = new(syscall.RawSockaddrAny)
}
o.msg.Name = (syscall.Pointer)(unsafe.Pointer(o.rsa)) o.msg.Name = (syscall.Pointer)(unsafe.Pointer(o.rsa))
o.msg.Namelen = int32(unsafe.Sizeof(*o.rsa)) o.msg.Namelen = int32(unsafe.Sizeof(*o.rsa))
o.msg.Flags = uint32(flags) o.msg.Flags = uint32(flags)
@ -1233,7 +1239,9 @@ func (fd *FD) ReadMsgInet6(p []byte, oob []byte, flags int, sa6 *syscall.Sockadd
o := &fd.rop o := &fd.rop
o.InitMsg(p, oob) o.InitMsg(p, oob)
o.rsa = new(syscall.RawSockaddrAny) if o.rsa == nil {
o.rsa = new(syscall.RawSockaddrAny)
}
o.msg.Name = (syscall.Pointer)(unsafe.Pointer(o.rsa)) o.msg.Name = (syscall.Pointer)(unsafe.Pointer(o.rsa))
o.msg.Namelen = int32(unsafe.Sizeof(*o.rsa)) o.msg.Namelen = int32(unsafe.Sizeof(*o.rsa))
o.msg.Flags = uint32(flags) o.msg.Flags = uint32(flags)
@ -1261,11 +1269,14 @@ func (fd *FD) WriteMsg(p []byte, oob []byte, sa syscall.Sockaddr) (int, int, err
o := &fd.wop o := &fd.wop
o.InitMsg(p, oob) o.InitMsg(p, oob)
if sa != nil { if sa != nil {
rsa, len, err := sockaddrToRaw(sa) if o.rsa == nil {
o.rsa = new(syscall.RawSockaddrAny)
}
len, err := sockaddrToRaw(o.rsa, sa)
if err != nil { if err != nil {
return 0, 0, err return 0, 0, err
} }
o.msg.Name = (syscall.Pointer)(rsa) o.msg.Name = (syscall.Pointer)(unsafe.Pointer(o.rsa))
o.msg.Namelen = len o.msg.Namelen = len
} }
n, err := execIO(o, func(o *operation) error { n, err := execIO(o, func(o *operation) error {
@ -1287,8 +1298,11 @@ func (fd *FD) WriteMsgInet4(p []byte, oob []byte, sa *syscall.SockaddrInet4) (in
o := &fd.wop o := &fd.wop
o.InitMsg(p, oob) o.InitMsg(p, oob)
rsa, len := sockaddrInet4ToRaw(sa) if o.rsa == nil {
o.msg.Name = (syscall.Pointer)(rsa) o.rsa = new(syscall.RawSockaddrAny)
}
len := sockaddrInet4ToRaw(o.rsa, sa)
o.msg.Name = (syscall.Pointer)(unsafe.Pointer(o.rsa))
o.msg.Namelen = len o.msg.Namelen = len
n, err := execIO(o, func(o *operation) error { n, err := execIO(o, func(o *operation) error {
return windows.WSASendMsg(o.fd.Sysfd, &o.msg, 0, &o.qty, &o.o, nil) return windows.WSASendMsg(o.fd.Sysfd, &o.msg, 0, &o.qty, &o.o, nil)
@ -1309,8 +1323,11 @@ func (fd *FD) WriteMsgInet6(p []byte, oob []byte, sa *syscall.SockaddrInet6) (in
o := &fd.wop o := &fd.wop
o.InitMsg(p, oob) o.InitMsg(p, oob)
rsa, len := sockaddrInet6ToRaw(sa) if o.rsa == nil {
o.msg.Name = (syscall.Pointer)(rsa) o.rsa = new(syscall.RawSockaddrAny)
}
len := sockaddrInet6ToRaw(o.rsa, sa)
o.msg.Name = (syscall.Pointer)(unsafe.Pointer(o.rsa))
o.msg.Namelen = len o.msg.Namelen = len
n, err := execIO(o, func(o *operation) error { n, err := execIO(o, func(o *operation) error {
return windows.WSASendMsg(o.fd.Sysfd, &o.msg, 0, &o.qty, &o.o, nil) return windows.WSASendMsg(o.fd.Sysfd, &o.msg, 0, &o.qty, &o.o, nil)