pool: return specified size of buffer

This commit is contained in:
nadoo committed 2020-04-19 23:20:15 +08:00
1 parent 5326c0a901
commit a0542a028e
16 files changed
+158 -139

No files matched your search

+10 -10
View File
@@ -51,18 +51,18 @@ func Relay(left, right net.Conn) (int64, int64, error) {
ch := make(chan res)
go func() {
buf := pool.GetBuffer(TCPBufSize)
n, err := io.CopyBuffer(right, left, buf)
pool.PutBuffer(buf)
b := pool.GetBuffer(TCPBufSize)
n, err := io.CopyBuffer(right, left, b)
pool.PutBuffer(b)
right.SetDeadline(time.Now()) // wake up the other goroutine blocking on right
left.SetDeadline(time.Now()) // wake up the other goroutine blocking on left
ch <- res{n, err}
}()
buf := pool.GetBuffer(TCPBufSize)
n, err := io.CopyBuffer(left, right, buf)
pool.PutBuffer(buf)
b := pool.GetBuffer(TCPBufSize)
n, err := io.CopyBuffer(left, right, b)
pool.PutBuffer(b)
right.SetDeadline(time.Now()) // wake up the other goroutine blocking on right
left.SetDeadline(time.Now()) // wake up the other goroutine blocking on left
@@ -76,17 +76,17 @@ func Relay(left, right net.Conn) (int64, int64, error) {
// RelayUDP copys from src to dst at target with read timeout.
func RelayUDP(dst net.PacketConn, target net.Addr, src net.PacketConn, timeout time.Duration) error {
buf := pool.GetBuffer(UDPBufSize)
defer pool.PutBuffer(buf)
b := pool.GetBuffer(UDPBufSize)
defer pool.PutBuffer(b)
for {
src.SetReadDeadline(time.Now().Add(timeout))
n, _, err := src.ReadFrom(buf)
n, _, err := src.ReadFrom(b)
if err != nil {
return err
}
_, err = dst.WriteTo(buf[:n], target)
_, err = dst.WriteTo(b[:n], target)
if err != nil {
return err
}
+3 -3
View File
@@ -29,14 +29,14 @@ var bufPools = [...]sync.Pool{
{New: func() interface{} { return make([]byte, 64<<10) }},
}
func GetBuffer(size int64) []byte {
func GetBuffer(size int) []byte {
i := 0
for ; i < len(bufSizes)-1; i++ {
if size <= int64(bufSizes[i]) {
if size <= bufSizes[i] {
break
}
}
return bufPools[i].Get().([]byte)
return bufPools[i].Get().([]byte)[:size]
}
func PutBuffer(p []byte) {
+1 -1
View File
@@ -9,7 +9,7 @@ var writeBufPool = sync.Pool{
New: func() interface{} { return &bytes.Buffer{} },
}
func GetWriteBuffer(size int64) *bytes.Buffer {
func GetWriteBuffer() *bytes.Buffer {
return writeBufPool.Get().(*bytes.Buffer)
}