Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
G
getty
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wei.xuan
getty
Commits
45d3d7d6
Unverified
Commit
45d3d7d6
authored
Apr 08, 2020
by
Xin.Zh
Committed by
GitHub
Apr 08, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #36 from zaihang365/33_using_writev
Impl: reduce syscall and memcopy for multiple package
parents
52cde594
7df84f8e
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
58 additions
and
51 deletions
+58
-51
client_test.go
client_test.go
+27
-0
connection.go
connection.go
+24
-11
session.go
session.go
+7
-40
No files found.
client_test.go
View file @
45d3d7d6
...
@@ -7,6 +7,7 @@ import (
...
@@ -7,6 +7,7 @@ import (
"os"
"os"
"strconv"
"strconv"
"sync"
"sync"
"sync/atomic"
"testing"
"testing"
"time"
"time"
)
)
...
@@ -122,7 +123,21 @@ func TestTCPClient(t *testing.T) {
...
@@ -122,7 +123,21 @@ func TestTCPClient(t *testing.T) {
ss
.
SetCompressType
(
CompressNone
)
ss
.
SetCompressType
(
CompressNone
)
conn
:=
ss
.
(
*
session
)
.
Connection
.
(
*
gettyTCPConn
)
conn
:=
ss
.
(
*
session
)
.
Connection
.
(
*
gettyTCPConn
)
assert
.
True
(
t
,
conn
.
compress
==
CompressNone
)
assert
.
True
(
t
,
conn
.
compress
==
CompressNone
)
beforeWriteBytes
:=
atomic
.
LoadUint32
(
&
conn
.
writeBytes
)
beforeWritePkgNum
:=
atomic
.
LoadUint32
(
&
conn
.
writePkgNum
)
_
,
err
=
conn
.
send
([]
byte
(
"hello"
))
assert
.
Equal
(
t
,
beforeWritePkgNum
+
1
,
atomic
.
LoadUint32
(
&
conn
.
writePkgNum
))
assert
.
Nil
(
t
,
err
)
assert
.
Equal
(
t
,
beforeWriteBytes
+
5
,
atomic
.
LoadUint32
(
&
conn
.
writeBytes
))
err
=
ss
.
WriteBytes
([]
byte
(
"hello"
))
err
=
ss
.
WriteBytes
([]
byte
(
"hello"
))
assert
.
Equal
(
t
,
beforeWriteBytes
+
10
,
atomic
.
LoadUint32
(
&
conn
.
writeBytes
))
assert
.
Equal
(
t
,
beforeWritePkgNum
+
2
,
atomic
.
LoadUint32
(
&
conn
.
writePkgNum
))
assert
.
Nil
(
t
,
err
)
var
pkgs
[][]
byte
pkgs
=
append
(
pkgs
,
[]
byte
(
"hello"
),
[]
byte
(
"hello"
))
_
,
err
=
conn
.
send
(
pkgs
)
assert
.
Equal
(
t
,
beforeWritePkgNum
+
4
,
atomic
.
LoadUint32
(
&
conn
.
writePkgNum
))
assert
.
Equal
(
t
,
beforeWriteBytes
+
20
,
atomic
.
LoadUint32
(
&
conn
.
writeBytes
))
assert
.
Nil
(
t
,
err
)
assert
.
Nil
(
t
,
err
)
ss
.
SetCompressType
(
CompressSnappy
)
ss
.
SetCompressType
(
CompressSnappy
)
assert
.
True
(
t
,
conn
.
compress
==
CompressSnappy
)
assert
.
True
(
t
,
conn
.
compress
==
CompressSnappy
)
...
@@ -194,7 +209,14 @@ func TestUDPClient(t *testing.T) {
...
@@ -194,7 +209,14 @@ func TestUDPClient(t *testing.T) {
_
,
err
=
udpConn
.
send
(
udpCtx
)
_
,
err
=
udpConn
.
send
(
udpCtx
)
assert
.
NotNil
(
t
,
err
)
assert
.
NotNil
(
t
,
err
)
udpCtx
.
Pkg
=
[]
byte
(
"hello"
)
udpCtx
.
Pkg
=
[]
byte
(
"hello"
)
beforeWriteBytes
:=
atomic
.
LoadUint32
(
&
udpConn
.
writeBytes
)
_
,
err
=
udpConn
.
send
(
udpCtx
)
_
,
err
=
udpConn
.
send
(
udpCtx
)
assert
.
Equal
(
t
,
beforeWriteBytes
+
5
,
atomic
.
LoadUint32
(
&
udpConn
.
writeBytes
))
assert
.
Nil
(
t
,
err
)
beforeWritePkgNum
:=
atomic
.
LoadUint32
(
&
udpConn
.
writePkgNum
)
err
=
ss
.
WritePkg
(
udpCtx
,
0
)
assert
.
Equal
(
t
,
beforeWritePkgNum
+
1
,
atomic
.
LoadUint32
(
&
udpConn
.
writePkgNum
))
assert
.
Nil
(
t
,
err
)
assert
.
Nil
(
t
,
err
)
clt
.
Close
()
clt
.
Close
()
...
@@ -247,8 +269,13 @@ func TestNewWSClient(t *testing.T) {
...
@@ -247,8 +269,13 @@ func TestNewWSClient(t *testing.T) {
assert
.
Nil
(
t
,
err
)
assert
.
Nil
(
t
,
err
)
_
,
err
=
conn
.
send
(
"hello"
)
_
,
err
=
conn
.
send
(
"hello"
)
assert
.
NotNil
(
t
,
err
)
assert
.
NotNil
(
t
,
err
)
beforeWriteBytes
:=
atomic
.
LoadUint32
(
&
conn
.
writeBytes
)
_
,
err
=
conn
.
send
([]
byte
(
"hello"
))
_
,
err
=
conn
.
send
([]
byte
(
"hello"
))
assert
.
Nil
(
t
,
err
)
assert
.
Nil
(
t
,
err
)
assert
.
Equal
(
t
,
beforeWriteBytes
+
5
,
atomic
.
LoadUint32
(
&
conn
.
writeBytes
))
beforeWritePkgNum
:=
atomic
.
LoadUint32
(
&
conn
.
writePkgNum
)
err
=
ss
.
WriteBytes
([]
byte
(
"hello"
))
assert
.
Equal
(
t
,
beforeWritePkgNum
+
1
,
atomic
.
LoadUint32
(
&
conn
.
writePkgNum
))
err
=
conn
.
writePing
()
err
=
conn
.
writePing
()
assert
.
Nil
(
t
,
err
)
assert
.
Nil
(
t
,
err
)
...
...
connection.go
View file @
45d3d7d6
...
@@ -265,9 +265,6 @@ func (t *gettyTCPConn) send(pkg interface{}) (int, error) {
...
@@ -265,9 +265,6 @@ func (t *gettyTCPConn) send(pkg interface{}) (int, error) {
length
int
length
int
)
)
if
p
,
ok
=
pkg
.
([]
byte
);
!
ok
{
return
0
,
perrors
.
Errorf
(
"illegal @pkg{%#v} type"
,
pkg
)
}
if
t
.
compress
==
CompressNone
&&
t
.
wTimeout
>
0
{
if
t
.
compress
==
CompressNone
&&
t
.
wTimeout
>
0
{
// Optimization: update write deadline only if more than 25%
// Optimization: update write deadline only if more than 25%
// of the last write deadline exceeded.
// of the last write deadline exceeded.
...
@@ -281,12 +278,28 @@ func (t *gettyTCPConn) send(pkg interface{}) (int, error) {
...
@@ -281,12 +278,28 @@ func (t *gettyTCPConn) send(pkg interface{}) (int, error) {
}
}
}
}
if
buffers
,
ok
:=
pkg
.
([][]
byte
);
ok
{
netBuf
:=
net
.
Buffers
(
buffers
)
if
length
,
err
:=
netBuf
.
WriteTo
(
t
.
conn
);
err
==
nil
{
atomic
.
AddUint32
(
&
t
.
writeBytes
,
(
uint32
)(
length
))
atomic
.
AddUint32
(
&
t
.
writePkgNum
,
(
uint32
)(
len
(
buffers
)))
}
log
.
Debugf
(
"localAddr: %s, remoteAddr:%s, now:%s, length:%d, err:%s"
,
t
.
conn
.
LocalAddr
(),
t
.
conn
.
RemoteAddr
(),
currentTime
,
length
,
err
)
return
int
(
length
),
perrors
.
WithStack
(
err
)
}
if
p
,
ok
=
pkg
.
([]
byte
);
ok
{
if
length
,
err
=
t
.
writer
.
Write
(
p
);
err
==
nil
{
if
length
,
err
=
t
.
writer
.
Write
(
p
);
err
==
nil
{
atomic
.
AddUint32
(
&
t
.
writeBytes
,
(
uint32
)(
len
(
p
)))
atomic
.
AddUint32
(
&
t
.
writeBytes
,
(
uint32
)(
len
(
p
)))
atomic
.
AddUint32
(
&
t
.
writePkgNum
,
1
)
}
}
log
.
Debugf
(
"now:%s, length:%d, err:%v"
,
currentTime
,
length
,
err
)
log
.
Debugf
(
"localAddr: %s, remoteAddr:%s, now:%s, length:%d, err:%s"
,
t
.
conn
.
LocalAddr
(),
t
.
conn
.
RemoteAddr
(),
currentTime
,
length
,
err
)
return
length
,
perrors
.
WithStack
(
err
)
return
length
,
perrors
.
WithStack
(
err
)
//return length, err
}
return
0
,
perrors
.
Errorf
(
"illegal @pkg{%#v} type"
,
pkg
)
}
}
// close tcp connection
// close tcp connection
...
@@ -437,11 +450,11 @@ func (u *gettyUDPConn) send(udpCtx interface{}) (int, error) {
...
@@ -437,11 +450,11 @@ func (u *gettyUDPConn) send(udpCtx interface{}) (int, error) {
if
length
,
_
,
err
=
u
.
conn
.
WriteMsgUDP
(
buf
,
nil
,
peerAddr
);
err
==
nil
{
if
length
,
_
,
err
=
u
.
conn
.
WriteMsgUDP
(
buf
,
nil
,
peerAddr
);
err
==
nil
{
atomic
.
AddUint32
(
&
u
.
writeBytes
,
(
uint32
)(
len
(
buf
)))
atomic
.
AddUint32
(
&
u
.
writeBytes
,
(
uint32
)(
len
(
buf
)))
atomic
.
AddUint32
(
&
u
.
writePkgNum
,
1
)
}
}
log
.
Debugf
(
"WriteMsgUDP(peerAddr:%s) = {length:%d, error:%v}"
,
peerAddr
,
length
,
err
)
log
.
Debugf
(
"WriteMsgUDP(peerAddr:%s) = {length:%d, error:%v}"
,
peerAddr
,
length
,
err
)
return
length
,
perrors
.
WithStack
(
err
)
return
length
,
perrors
.
WithStack
(
err
)
//return length, err
}
}
// close udp connection
// close udp connection
...
@@ -531,7 +544,7 @@ func (w *gettyWSConn) recv() ([]byte, error) {
...
@@ -531,7 +544,7 @@ func (w *gettyWSConn) recv() ([]byte, error) {
// gorilla/websocket/conn.go:NextReader will always fail when got a timeout error.
// gorilla/websocket/conn.go:NextReader will always fail when got a timeout error.
_
,
b
,
e
:=
w
.
conn
.
ReadMessage
()
// the first return value is message type.
_
,
b
,
e
:=
w
.
conn
.
ReadMessage
()
// the first return value is message type.
if
e
==
nil
{
if
e
==
nil
{
w
.
incReadPkgNum
(
)
atomic
.
AddUint32
(
&
w
.
readBytes
,
(
uint32
)(
len
(
b
))
)
}
else
{
}
else
{
if
websocket
.
IsUnexpectedCloseError
(
e
,
websocket
.
CloseGoingAway
)
{
if
websocket
.
IsUnexpectedCloseError
(
e
,
websocket
.
CloseGoingAway
)
{
log
.
Warnf
(
"websocket unexpected close error: %v"
,
e
)
log
.
Warnf
(
"websocket unexpected close error: %v"
,
e
)
...
@@ -579,9 +592,9 @@ func (w *gettyWSConn) send(pkg interface{}) (int, error) {
...
@@ -579,9 +592,9 @@ func (w *gettyWSConn) send(pkg interface{}) (int, error) {
w
.
updateWriteDeadline
()
w
.
updateWriteDeadline
()
if
err
=
w
.
conn
.
WriteMessage
(
websocket
.
BinaryMessage
,
p
);
err
==
nil
{
if
err
=
w
.
conn
.
WriteMessage
(
websocket
.
BinaryMessage
,
p
);
err
==
nil
{
atomic
.
AddUint32
(
&
w
.
writeBytes
,
(
uint32
)(
len
(
p
)))
atomic
.
AddUint32
(
&
w
.
writeBytes
,
(
uint32
)(
len
(
p
)))
atomic
.
AddUint32
(
&
w
.
writePkgNum
,
1
)
}
}
return
len
(
p
),
perrors
.
WithStack
(
err
)
return
len
(
p
),
perrors
.
WithStack
(
err
)
//return len(p), err
}
}
func
(
w
*
gettyWSConn
)
writePing
()
error
{
func
(
w
*
gettyWSConn
)
writePing
()
error
{
...
...
session.go
View file @
45d3d7d6
...
@@ -301,7 +301,7 @@ func (s *session) SetWQLen(writeQLen int) {
...
@@ -301,7 +301,7 @@ func (s *session) SetWQLen(writeQLen int) {
s
.
lock
.
Lock
()
s
.
lock
.
Lock
()
defer
s
.
lock
.
Unlock
()
defer
s
.
lock
.
Unlock
()
s
.
wQ
=
make
(
chan
interface
{},
writeQLen
)
s
.
wQ
=
make
(
chan
interface
{},
writeQLen
)
log
.
Debug
(
"%s, [session.SetWQLen] wQ{len:%d, cap:%d}"
,
s
.
Stat
(),
len
(
s
.
wQ
),
cap
(
s
.
wQ
))
log
.
Debug
f
(
"%s, [session.SetWQLen] wQ{len:%d, cap:%d}"
,
s
.
Stat
(),
len
(
s
.
wQ
),
cap
(
s
.
wQ
))
}
}
// set maximum wait time when session got error or got exit signal
// set maximum wait time when session got error or got exit signal
...
@@ -404,10 +404,9 @@ func (s *session) WritePkg(pkg interface{}, timeout time.Duration) error {
...
@@ -404,10 +404,9 @@ func (s *session) WritePkg(pkg interface{}, timeout time.Duration) error {
}
}
_
,
err
=
s
.
Connection
.
send
(
pkg
)
_
,
err
=
s
.
Connection
.
send
(
pkg
)
if
err
!=
nil
{
if
err
!=
nil
{
log
.
Warn
(
"%s, [session.WritePkg] @s.Connection.Write(pkg:%#v) = err:%v"
,
s
.
Stat
(),
pkg
,
err
)
log
.
Warn
f
(
"%s, [session.WritePkg] @s.Connection.Write(pkg:%#v) = err:%v"
,
s
.
Stat
(),
pkg
,
err
)
return
perrors
.
WithStack
(
err
)
return
perrors
.
WithStack
(
err
)
}
}
s
.
incWritePkgNum
()
return
nil
return
nil
}
}
select
{
select
{
...
@@ -432,9 +431,6 @@ func (s *session) WriteBytes(pkg []byte) error {
...
@@ -432,9 +431,6 @@ func (s *session) WriteBytes(pkg []byte) error {
if
_
,
err
:=
s
.
Connection
.
send
(
pkg
);
err
!=
nil
{
if
_
,
err
:=
s
.
Connection
.
send
(
pkg
);
err
!=
nil
{
return
perrors
.
Wrapf
(
err
,
"s.Connection.Write(pkg len:%d)"
,
len
(
pkg
))
return
perrors
.
Wrapf
(
err
,
"s.Connection.Write(pkg len:%d)"
,
len
(
pkg
))
}
}
s
.
incWritePkgNum
()
return
nil
return
nil
}
}
...
@@ -449,39 +445,10 @@ func (s *session) WriteBytesArray(pkgs ...[]byte) error {
...
@@ -449,39 +445,10 @@ func (s *session) WriteBytesArray(pkgs ...[]byte) error {
return
s
.
WriteBytes
(
pkgs
[
0
])
return
s
.
WriteBytes
(
pkgs
[
0
])
}
}
// get len
// TODO Currently, only TCP is supported.
var
(
if
_
,
err
:=
s
.
Connection
.
send
(
pkgs
);
err
!=
nil
{
l
int
return
perrors
.
Wrapf
(
err
,
"s.Connection.Write(pkgs num:%d)"
,
len
(
pkgs
))
err
error
length
int
arrp
*
[]
byte
arr
[]
byte
)
length
=
0
for
i
:=
0
;
i
<
len
(
pkgs
);
i
++
{
length
+=
len
(
pkgs
[
i
])
}
// merge the pkgs
// arr = make([]byte, length)
arrp
=
gxbytes
.
GetBytes
(
length
)
defer
gxbytes
.
PutBytes
(
arrp
)
arr
=
*
arrp
l
=
0
for
i
:=
0
;
i
<
len
(
pkgs
);
i
++
{
copy
(
arr
[
l
:
],
pkgs
[
i
])
l
+=
len
(
pkgs
[
i
])
}
if
err
=
s
.
WriteBytes
(
arr
);
err
!=
nil
{
return
perrors
.
WithStack
(
err
)
}
}
num
:=
len
(
pkgs
)
-
1
for
i
:=
0
;
i
<
num
;
i
++
{
s
.
incWritePkgNum
()
}
return
nil
return
nil
}
}
...
@@ -567,7 +534,7 @@ LOOP:
...
@@ -567,7 +534,7 @@ LOOP:
continue
continue
}
}
if
!
flag
{
if
!
flag
{
log
.
Warn
(
"[session.handleLoop] drop write out package %#v"
,
outPkg
)
log
.
Warn
f
(
"[session.handleLoop] drop write out package %#v"
,
outPkg
)
continue
continue
}
}
...
@@ -958,6 +925,6 @@ func (s *session) gc() {
...
@@ -958,6 +925,6 @@ func (s *session) gc() {
// or (session)handleLoop automatically. It's thread safe.
// or (session)handleLoop automatically. It's thread safe.
func
(
s
*
session
)
Close
()
{
func
(
s
*
session
)
Close
()
{
s
.
stop
()
s
.
stop
()
log
.
Info
(
"%s closed now. its current gr num is %d"
,
log
.
Info
f
(
"%s closed now. its current gr num is %d"
,
s
.
sessionToken
(),
atomic
.
LoadInt32
(
&
(
s
.
grNum
)))
s
.
sessionToken
(),
atomic
.
LoadInt32
(
&
(
s
.
grNum
)))
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment