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
293a60d4
Unverified
Commit
293a60d4
authored
Jul 29, 2019
by
望哥
Committed by
GitHub
Jul 29, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #22 from divebomb/master
Imp: use bytes pool in session.go
parents
ded69492
1d7c20c9
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
112 additions
and
26 deletions
+112
-26
client.go
client.go
+6
-1
README.md
demo/hello/README.md
+17
-6
client.go
demo/hello/tcp/client/client.go
+23
-0
config.go
demo/hello/tcp/config.go
+7
-2
server.go
demo/hello/tcp/server/server.go
+14
-11
pprof.go
demo/util/pprof.go
+20
-0
session.go
session.go
+25
-6
No files found.
client.go
View file @
293a60d4
...
...
@@ -23,6 +23,7 @@ import (
)
import
(
"github.com/dubbogo/gost/bytes"
"github.com/gorilla/websocket"
perrors
"github.com/pkg/errors"
)
...
...
@@ -163,10 +164,14 @@ func (c *client) dialUDP() Session {
localAddr
*
net
.
UDPAddr
peerAddr
*
net
.
UDPAddr
length
int
bufp
*
[]
byte
buf
[]
byte
)
buf
=
make
([]
byte
,
128
)
// buf = make([]byte, 128)
bufp
=
gxbytes
.
GetBytes
(
128
)
defer
gxbytes
.
PutBytes
(
bufp
)
buf
=
*
bufp
localAddr
=
&
net
.
UDPAddr
{
IP
:
net
.
IPv4zero
,
Port
:
0
}
peerAddr
,
_
=
net
.
ResolveUDPAddr
(
"udp"
,
c
.
addr
)
for
{
...
...
demo/hello/README.md
View file @
293a60d4
...
...
@@ -16,9 +16,10 @@ run server:
Or run server in task pool mode:
```
bash
go run tcp/server/server.go
-taskPool
=
true
\
-task_queue_length
=
100
\
-task_queue_number
=
4
\
-task_pool_size
=
2000
-task_queue_length
=
128
\
-task_queue_number
=
16
\
-task_pool_size
=
2000
\
-pprof_port
=
60000
```
## 3. run client
...
...
@@ -26,3 +27,13 @@ go run tcp/server/server.go -taskPool=true \
```
bash
go run tcp/client/client.go
```
Or run client in task pool mode:
```
bash
go run tcp/client/client.go
-taskPool
=
true
\
-task_queue_length
=
100
\
-task_queue_number
=
4
\
-task_pool_size
=
50
\
-pprof_port
=
60001
```
demo/hello/tcp/client/client.go
View file @
293a60d4
...
...
@@ -13,6 +13,7 @@ import (
import
(
"github.com/dubbogo/getty"
"github.com/dubbogo/gost/sync"
)
import
(
...
...
@@ -24,12 +25,33 @@ import (
var
(
ip
=
flag
.
String
(
"ip"
,
"127.0.0.1"
,
"server IP"
)
connections
=
flag
.
Int
(
"conn"
,
1
,
"number of tcp connections"
)
taskPoolMode
=
flag
.
Bool
(
"taskPool"
,
false
,
"task pool mode"
)
taskPoolQueueLength
=
flag
.
Int
(
"task_queue_length"
,
100
,
"task queue length"
)
taskPoolQueueNumber
=
flag
.
Int
(
"task_queue_number"
,
4
,
"task queue number"
)
taskPoolSize
=
flag
.
Int
(
"task_pool_size"
,
2000
,
"task poll size"
)
pprofPort
=
flag
.
Int
(
"pprof_port"
,
65431
,
"pprof http port"
)
)
var
(
taskPool
*
gxsync
.
TaskPool
)
func
main
()
{
flag
.
Parse
()
util
.
SetLimit
()
util
.
Profiling
(
*
pprofPort
)
if
*
taskPoolMode
{
taskPool
=
gxsync
.
NewTaskPool
(
gxsync
.
WithTaskPoolTaskQueueLength
(
*
taskPoolQueueLength
),
gxsync
.
WithTaskPoolTaskQueueNumber
(
*
taskPoolQueueNumber
),
gxsync
.
WithTaskPoolTaskPoolSize
(
*
taskPoolSize
),
)
}
client
:=
getty
.
NewTCPClient
(
getty
.
WithServerAddress
(
*
ip
+
":8090"
),
getty
.
WithConnectionNumber
(
*
connections
),
...
...
@@ -41,3 +63,4 @@ func main() {
util
.
WaitCloseSignals
(
client
)
}
demo/hello/tcp/config.go
View file @
293a60d4
...
...
@@ -26,11 +26,16 @@ var (
eventListener
=
&
hello
.
MessageHandler
{}
)
func
NewHelloClientSession
(
session
getty
.
Session
)
(
err
error
)
{
func
NewHelloClientSession
(
session
getty
.
Session
,
taskPool
*
gxsync
.
TaskPool
)
(
err
error
)
{
eventListener
.
SessionOnOpen
=
func
(
session
getty
.
Session
)
{
hello
.
Sessions
=
append
(
hello
.
Sessions
,
session
)
}
return
InitialSession
(
session
)
err
=
InitialSession
(
session
)
if
err
!=
nil
{
return
}
session
.
SetTaskPool
(
taskPool
)
return
}
func
InitialSession
(
session
getty
.
Session
)
(
err
error
)
{
...
...
demo/hello/tcp/server/server.go
View file @
293a60d4
...
...
@@ -22,14 +22,15 @@ import (
)
var
(
taskPollMode
=
flag
.
Bool
(
"taskPool"
,
false
,
"task pool mode"
)
taskPollQueueLength
=
flag
.
Int
(
"task_queue_length"
,
100
,
"task queue length"
)
taskPollQueueNumber
=
flag
.
Int
(
"task_queue_number"
,
4
,
"task queue number"
)
taskPollSize
=
flag
.
Int
(
"task_pool_size"
,
2000
,
"task poll size"
)
taskPoolMode
=
flag
.
Bool
(
"taskPool"
,
false
,
"task pool mode"
)
taskPoolQueueLength
=
flag
.
Int
(
"task_queue_length"
,
100
,
"task queue length"
)
taskPoolQueueNumber
=
flag
.
Int
(
"task_queue_number"
,
4
,
"task queue number"
)
taskPoolSize
=
flag
.
Int
(
"task_pool_size"
,
2000
,
"task poll size"
)
pprofPort
=
flag
.
Int
(
"pprof_port"
,
65432
,
"pprof http port"
)
)
var
(
taskPo
l
l
*
gxsync
.
TaskPool
taskPo
o
l
*
gxsync
.
TaskPool
)
func
main
()
{
...
...
@@ -37,13 +38,15 @@ func main() {
util
.
SetLimit
()
util
.
Profiling
(
*
pprofPort
)
options
:=
[]
getty
.
ServerOption
{
getty
.
WithLocalAddress
(
":8090"
)}
if
*
taskPo
l
lMode
{
taskPo
l
l
=
gxsync
.
NewTaskPool
(
gxsync
.
WithTaskPoolTaskQueueLength
(
*
taskPo
l
lQueueLength
),
gxsync
.
WithTaskPoolTaskQueueNumber
(
*
taskPo
l
lQueueNumber
),
gxsync
.
WithTaskPoolTaskPoolSize
(
*
taskPo
l
lSize
),
if
*
taskPo
o
lMode
{
taskPo
o
l
=
gxsync
.
NewTaskPool
(
gxsync
.
WithTaskPoolTaskQueueLength
(
*
taskPo
o
lQueueLength
),
gxsync
.
WithTaskPoolTaskQueueNumber
(
*
taskPo
o
lQueueNumber
),
gxsync
.
WithTaskPoolTaskPoolSize
(
*
taskPo
o
lSize
),
)
}
...
...
@@ -59,6 +62,6 @@ func NewHelloServerSession(session getty.Session) (err error) {
if
err
!=
nil
{
return
}
session
.
SetTaskPool
(
taskPo
l
l
)
session
.
SetTaskPool
(
taskPo
o
l
)
return
}
demo/util/pprof.go
0 → 100644
View file @
293a60d4
/******************************************************
# MAINTAINER : Alex Stocks
# LICENCE : Apache License 2.0
# EMAIL : alexstocks@foxmail.com
# MOD : 2019-07-25
******************************************************/
package
util
import
(
"fmt"
"net/http"
_
"net/http/pprof"
)
func
Profiling
(
port
int
)
{
go
func
()
{
http
.
ListenAndServe
(
fmt
.
Sprintf
(
":%d"
,
port
),
nil
)
}()
}
session.go
View file @
293a60d4
...
...
@@ -20,6 +20,7 @@ import (
)
import
(
gxbytes
"github.com/dubbogo/gost/bytes"
gxsync
"github.com/dubbogo/gost/sync"
gxtime
"github.com/dubbogo/gost/time"
"github.com/gorilla/websocket"
...
...
@@ -413,16 +414,20 @@ func (s *session) WriteBytesArray(pkgs ...[]byte) error {
var
(
l
int
err
error
length
uint32
length
int
arrp
*
[]
byte
arr
[]
byte
)
length
=
0
for
i
:=
0
;
i
<
len
(
pkgs
);
i
++
{
length
+=
uint32
(
len
(
pkgs
[
i
])
)
length
+=
len
(
pkgs
[
i
]
)
}
// merge the pkgs
arr
=
make
([]
byte
,
length
)
// 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
])
...
...
@@ -608,13 +613,24 @@ func (s *session) handleTCPPackage() error {
exit
bool
bufLen
int
pkgLen
int
bufp
*
[]
byte
buf
[]
byte
pktBuf
*
bytes
.
Buffer
pkg
interface
{}
)
buf
=
make
([]
byte
,
maxReadBufLen
)
pktBuf
=
new
(
bytes
.
Buffer
)
// buf = make([]byte, maxReadBufLen)
bufp
=
gxbytes
.
GetBytes
(
maxReadBufLen
)
buf
=
*
bufp
// pktBuf = new(bytes.Buffer)
pktBuf
=
gxbytes
.
GetBytesBuffer
()
defer
func
()
{
gxbytes
.
PutBytes
(
bufp
)
gxbytes
.
PutBytesBuffer
(
pktBuf
)
}()
conn
=
s
.
Connection
.
(
*
gettyTCPConn
)
for
{
if
s
.
IsClosed
()
{
...
...
@@ -689,6 +705,7 @@ func (s *session) handleUDPPackage() error {
conn
*
gettyUDPConn
bufLen
int
maxBufLen
int
bufp
*
[]
byte
buf
[]
byte
addr
*
net
.
UDPAddr
pkgLen
int
...
...
@@ -700,7 +717,9 @@ func (s *session) handleUDPPackage() error {
if
int
(
s
.
maxMsgLen
<<
1
)
<
bufLen
{
maxBufLen
=
int
(
s
.
maxMsgLen
<<
1
)
}
buf
=
make
([]
byte
,
maxBufLen
)
bufp
=
gxbytes
.
GetBytes
(
maxBufLen
)
//make([]byte, maxBufLen)
defer
gxbytes
.
PutBytes
(
bufp
)
buf
=
*
bufp
for
{
if
s
.
IsClosed
()
{
break
...
...
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