github/kcptun
4
0
Fork 0
mirror of https://github.com/xtaci/kcptun.git synced 2024-04-21 12:32:32 +00:00
Code Issues Releases Wiki Activity

reuse buffer for io.copyBuffer

Browse Source
This commit is contained in:
xtaci
2019-04-22 14:10:12 +08:00
parent 3f6134be00
commit 75e83adfba
2 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/main.go
+16 -7
View File
@@ -9,6 +9,7 @@ import (
"math/rand"
"net"
"os"
"sync"
"time"
"golang.org/x/crypto/pbkdf2"
@@ -22,12 +23,14 @@ import (
"path/filepath"
)
var (
// VERSION is injected by buildflags
VERSION = "SELFBUILD"
// SALT is use for pbkdf2 key expansion
SALT = "kcp-go"
)
// SALT is use for pbkdf2 key expansion
const SALT = "kcp-go"
// VERSION is injected by buildflags
var VERSION = "SELFBUILD"
// A pool for stream copying
var xmitBuf sync.Pool
type compStream struct {
conn net.Conn
@@ -74,7 +77,9 @@ func handleClient(sess *smux.Session, p1 io.ReadWriteCloser, quiet bool) {
streamCopy := func(dst io.Writer, src io.Reader) chan struct{} {
die := make(chan struct{})
go func() {
io.CopyBuffer(dst, src, make([]byte, 65535))
buf := xmitBuf.Get().([]byte)
io.CopyBuffer(dst, src, buf)
xmitBuf.Put(buf)
close(die)
}()
return die
@@ -99,6 +104,10 @@ func main() {
// add more log flags for debugging
log.SetFlags(log.LstdFlags | log.Lshortfile)
}
xmitBuf.New = func() interface{} {
return make([]byte, 65535)
}
myApp := cli.NewApp()
myApp.Name = "kcptun"
myApp.Usage = "client(with SMUX)"
server/main.go
+16 -7
View File
@@ -11,6 +11,7 @@ import (
"net/http"
_ "net/http/pprof"
"os"
"sync"
"time"
"golang.org/x/crypto/pbkdf2"
@@ -23,12 +24,14 @@ import (
"github.com/xtaci/smux"
)
var (
// VERSION is injected by buildflags
VERSION = "SELFBUILD"
// SALT is use for pbkdf2 key expansion
SALT = "kcp-go"
)
// SALT is use for pbkdf2 key expansion
const SALT = "kcp-go"
// VERSION is injected by buildflags
var VERSION = "SELFBUILD"
// A pool for stream copying
var xmitBuf sync.Pool
type compStream struct {
conn net.Conn
@@ -102,7 +105,9 @@ func handleClient(p1, p2 io.ReadWriteCloser, quiet bool) {
streamCopy := func(dst io.Writer, src io.Reader) chan struct{} {
die := make(chan struct{})
go func() {
io.CopyBuffer(dst, src, make([]byte, 65535))
buf := xmitBuf.Get().([]byte)
io.CopyBuffer(dst, src, buf)
xmitBuf.Put(buf)
close(die)
}()
return die
@@ -127,6 +132,10 @@ func main() {
// add more log flags for debugging
log.SetFlags(log.LstdFlags | log.Lshortfile)
}
xmitBuf.New = func() interface{} {
return make([]byte, 65535)
}
myApp := cli.NewApp()
myApp.Name = "kcptun"
myApp.Usage = "server(with SMUX)"