From fc1e6e8ff2a6525073103f848e944d6e6f281c4f Mon Sep 17 00:00:00 2001 From: ginuerzh Date: Thu, 31 Mar 2022 21:06:33 +0800 Subject: [PATCH] decrease copy buffer --- common/bufpool/pool.go | 9 +++++++++ common/net/dialer/dialer.go | 2 +- common/net/dialer/dialer_linux.go | 2 -- common/net/transport.go | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/common/bufpool/pool.go b/common/bufpool/pool.go index 5af2c87..31447c4 100644 --- a/common/bufpool/pool.go +++ b/common/bufpool/pool.go @@ -34,6 +34,15 @@ var ( }, }, }, + { + size: 2048, + pool: sync.Pool{ + New: func() any { + b := make([]byte, 2048) + return &b + }, + }, + }, { size: 4096, pool: sync.Pool{ diff --git a/common/net/dialer/dialer.go b/common/net/dialer/dialer.go index c4db350..f9ea819 100644 --- a/common/net/dialer/dialer.go +++ b/common/net/dialer/dialer.go @@ -46,7 +46,7 @@ func (d *NetDialer) Dial(ctx context.Context, network, addr string) (net.Conn, e if d.DialFunc != nil { return d.DialFunc(ctx, network, addr) } - log.Infof("interface: %s %v/%s", ifceName, ifAddr, network) + log.Debugf("interface: %s %v/%s", ifceName, ifAddr, network) switch network { case "udp", "udp4", "udp6": diff --git a/common/net/dialer/dialer_linux.go b/common/net/dialer/dialer_linux.go index 7cb1cde..730af75 100644 --- a/common/net/dialer/dialer_linux.go +++ b/common/net/dialer/dialer_linux.go @@ -5,8 +5,6 @@ import ( ) func bindDevice(fd uintptr, ifceName string) error { - // unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_REUSEADDR, 1) - // unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_REUSEPORT, 1) if ifceName == "" { return nil } diff --git a/common/net/transport.go b/common/net/transport.go index fc58e2c..93674af 100644 --- a/common/net/transport.go +++ b/common/net/transport.go @@ -26,7 +26,7 @@ func Transport(rw1, rw2 io.ReadWriter) error { } func copyBuffer(dst io.Writer, src io.Reader) error { - buf := bufpool.Get(16 * 1024) + buf := bufpool.Get(4 * 1024) defer bufpool.Put(buf) _, err := io.CopyBuffer(dst, src, *buf)