mirror of
https://github.com/nadoo/glider.git
synced 2026-11-19 07:09:42 +08:00
proxy: optimize Copy for network connection
This commit is contained in:
1 parent
e9f6f15290
commit
32990ebf77
4 files changed
+33
-27
No files matched your search
+16
-10
@@ -6,6 +6,7 @@ import (
|
||||
"io"
|
||||
"net"
|
||||
"os"
|
||||
"runtime"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
@@ -70,18 +71,20 @@ func Relay(left, right net.Conn) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func worthReadFrom(src io.Reader) bool {
|
||||
func worthTry(src io.Reader) bool {
|
||||
switch v := src.(type) {
|
||||
case *net.TCPConn, *net.UnixConn:
|
||||
return true
|
||||
case *io.LimitedReader:
|
||||
return worthTry(v.R)
|
||||
case *Conn:
|
||||
return worthTry(v.Conn)
|
||||
case *os.File:
|
||||
fi, err := v.Stat()
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
return fi.Mode().IsRegular()
|
||||
case *io.LimitedReader:
|
||||
return worthReadFrom(v.R)
|
||||
default:
|
||||
return false
|
||||
}
|
||||
@@ -95,15 +98,18 @@ func underlyingWriter(c io.Writer) io.Writer {
|
||||
}
|
||||
|
||||
// Copy copies from src to dst.
|
||||
// it will try to avoid memory allocating by using WriteTo or ReadFrom method,
|
||||
// if both failed, then it'll fallback to call CopyBuffer method.
|
||||
func Copy(dst io.Writer, src io.Reader) (written int64, err error) {
|
||||
if wt, ok := src.(io.WriterTo); ok {
|
||||
return wt.WriteTo(dst)
|
||||
}
|
||||
dst = underlyingWriter(dst)
|
||||
if rt, ok := dst.(io.ReaderFrom); ok && worthReadFrom(src) {
|
||||
return rt.ReadFrom(src)
|
||||
switch runtime.GOOS {
|
||||
case "linux", "windows", "dragonfly", "freebsd", "solaris":
|
||||
if _, ok := dst.(*net.TCPConn); ok && worthTry(src) {
|
||||
if wt, ok := src.(io.WriterTo); ok {
|
||||
return wt.WriteTo(dst)
|
||||
}
|
||||
if rt, ok := dst.(io.ReaderFrom); ok {
|
||||
return rt.ReadFrom(src)
|
||||
}
|
||||
}
|
||||
}
|
||||
return CopyBuffer(dst, src)
|
||||
}
|
||||
|
||||
+11
-11
@@ -66,27 +66,27 @@ func (w *frameWriter) Write(b []byte) (int, error) {
|
||||
hdr[1] = maskBit
|
||||
}
|
||||
|
||||
nPayload, nLenField := len(b), 0
|
||||
nPayload, nHeader := len(b), 2
|
||||
switch {
|
||||
case nPayload <= 125:
|
||||
hdr[1] |= byte(nPayload)
|
||||
case nPayload < 65536:
|
||||
hdr[1] |= 126
|
||||
nLenField = 2
|
||||
binary.BigEndian.PutUint16(hdr[2:2+nLenField], uint16(nPayload))
|
||||
nHeader += 2
|
||||
binary.BigEndian.PutUint16(hdr[2:nHeader], uint16(nPayload))
|
||||
default:
|
||||
hdr[1] |= 127
|
||||
nLenField = 8
|
||||
binary.BigEndian.PutUint64(hdr[2:2+nLenField], uint64(nPayload))
|
||||
nHeader += 8
|
||||
binary.BigEndian.PutUint64(hdr[2:nHeader], uint64(nPayload))
|
||||
}
|
||||
|
||||
header := hdr[:2+nLenField]
|
||||
header := hdr[:nHeader]
|
||||
if w.server {
|
||||
n, err := (&net.Buffers{header, b}).WriteTo(w.Writer)
|
||||
if int(n) <= len(header) {
|
||||
return 0, err
|
||||
if int(n) > nHeader {
|
||||
return int(n) - nHeader, err
|
||||
}
|
||||
return int(n) - len(header), err
|
||||
return 0, err
|
||||
}
|
||||
|
||||
payload := pool.GetBuffer(nPayload)
|
||||
@@ -98,8 +98,8 @@ func (w *frameWriter) Write(b []byte) (int, error) {
|
||||
}
|
||||
|
||||
n, err := (&net.Buffers{header, w.maskKey[:], payload}).WriteTo(w.Writer)
|
||||
if int(n) > len(header)+4 {
|
||||
return int(n) - len(header) - 4, err
|
||||
if int(n) > nHeader+4 {
|
||||
return int(n) - nHeader - 4, err
|
||||
}
|
||||
return 0, err
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user