Skip to content

Commit 6d2f83a

Browse files
AlexStocksAlexStocks
committed
Imp: enlarge time span from 2m to 15m
1 parent 08948cd commit 6d2f83a

11 files changed

+52
-107
lines changed

‎change_log.md

+5
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
## develop history ##
1515
---
1616

17+
- 2020/01/11
18+
> Feature
19+
* Imp: enlarge time wheel span from 2 mimutes to 15 minutes
20+
* version: v1.1.2
21+
1722
- 2019/09/05
1823
> Feature
1924
* add writev

‎client.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
import (
2626
log "github.com/AlexStocks/log4go"
2727
gxbytes "github.com/dubbogo/gost/bytes"
28+
"github.com/dubbogo/gost/net"
2829
"github.com/gorilla/websocket"
2930
jerrors "github.com/juju/errors"
3031
)
@@ -145,7 +146,7 @@ func (c *client) dialTCP() Session {
145146
return nil
146147
}
147148
conn, err = net.DialTimeout("tcp", c.addr, connectTimeout)
148-
if err == nil && IsSameAddr(conn.RemoteAddr(), conn.LocalAddr()) {
149+
if err == nil && gxnet.IsSameAddr(conn.RemoteAddr(), conn.LocalAddr()) {
149150
conn.Close()
150151
err = errSelfConnect
151152
}
@@ -182,7 +183,7 @@ func (c *client) dialUDP() Session {
182183
return nil
183184
}
184185
conn, err = net.DialUDP("udp", localAddr, peerAddr)
185-
if err == nil && IsSameAddr(conn.RemoteAddr(), conn.LocalAddr()) {
186+
if err == nil && gxnet.IsSameAddr(conn.RemoteAddr(), conn.LocalAddr()) {
186187
conn.Close()
187188
err = errSelfConnect
188189
}
@@ -235,7 +236,7 @@ func (c *client) dialWS() Session {
235236
}
236237
conn, _, err = dialer.Dial(c.addr, nil)
237238
log.Info("websocket.dialer.Dial(addr:%s) = error:%s", c.addr, jerrors.ErrorStack(err))
238-
if err == nil && IsSameAddr(conn.RemoteAddr(), conn.LocalAddr()) {
239+
if err == nil && gxnet.IsSameAddr(conn.RemoteAddr(), conn.LocalAddr()) {
239240
conn.Close()
240241
err = errSelfConnect
241242
}
@@ -313,7 +314,7 @@ func (c *client) dialWSS() Session {
313314
return nil
314315
}
315316
conn, _, err = dialer.Dial(c.addr, nil)
316-
if err == nil && IsSameAddr(conn.RemoteAddr(), conn.LocalAddr()) {
317+
if err == nil && gxnet.IsSameAddr(conn.RemoteAddr(), conn.LocalAddr()) {
317318
conn.Close()
318319
err = errSelfConnect
319320
}

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module github.com/AlexStocks/getty
22

33
require (
4-
github.com/dubbogo/gost v1.5.1
4+
github.com/dubbogo/gost v1.5.2
55
github.com/AlexStocks/log4go v1.0.2
66
github.com/coreos/go-systemd v0.0.0-20190318101727-c7c1946145b6 // indirect
77
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect

‎rpc/client.go

-1
Original file line numberDiff line numberDiff line change
@@ -261,4 +261,3 @@ func (c *Client) removePendingResponse(seq SequenceType) *PendingResponse {
261261
}
262262
return nil
263263
}
264-

‎rpc/config.go

+14
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ import (
88
jerrors "github.com/juju/errors"
99
)
1010

11+
import (
12+
"github.com/AlexStocks/getty"
13+
)
14+
1115
type (
1216
GettySessionParam struct {
1317
CompressEncoding bool `default:"false" yaml:"compress_encoding" json:"compress_encoding,omitempty"`
@@ -110,6 +114,11 @@ func (c *ClientConfig) CheckValidity() error {
110114
return jerrors.Annotatef(err, "time.ParseDuration(HeartbeatPeroid{%#v})", c.HeartbeatPeriod)
111115
}
112116

117+
if c.heartbeatPeriod >= time.Duration(getty.MaxWheelTimeSpan) {
118+
return jerrors.Annotatef(err, "heartbeat_period %s should be less than %s",
119+
c.HeartbeatPeriod, time.Duration(getty.MaxWheelTimeSpan))
120+
}
121+
113122
if c.sessionTimeout, err = time.ParseDuration(c.SessionTimeout); err != nil {
114123
return jerrors.Annotatef(err, "time.ParseDuration(SessionTimeout{%#v})", c.SessionTimeout)
115124
}
@@ -128,6 +137,11 @@ func (c *ServerConfig) CheckValidity() error {
128137
return jerrors.Annotatef(err, "time.ParseDuration(SessionTimeout{%#v})", c.SessionTimeout)
129138
}
130139

140+
if c.sessionTimeout >= time.Duration(getty.MaxWheelTimeSpan) {
141+
return jerrors.Annotatef(err, "session_timeout %s should be less than %s",
142+
c.SessionTimeout, time.Duration(getty.MaxWheelTimeSpan))
143+
}
144+
131145
if c.failFastTimeout, err = time.ParseDuration(c.FailFastTimeout); err != nil {
132146
return jerrors.Annotatef(err, "time.ParseDuration(FailFastTimeout{%#v})", c.FailFastTimeout)
133147
}

‎rpc/listener.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ type rpcSession struct {
2525
reqNum int32
2626
}
2727

28-
func (s *rpcSession)AddReqNum(num int32) {
28+
func (s *rpcSession) AddReqNum(num int32) {
2929
atomic.AddInt32(&s.reqNum, num)
3030
}
3131

32-
func (s *rpcSession)GetReqNum() int32 {
32+
func (s *rpcSession) GetReqNum() int32 {
3333
return atomic.LoadInt32(&s.reqNum)
3434
}
3535

@@ -100,7 +100,6 @@ func (h *RpcServerHandler) OnMessage(session getty.Session, pkg interface{}) {
100100
}
101101
}
102102

103-
104103
req, ok := pkg.(GettyRPCRequestPackage)
105104
if !ok {
106105
log.Error("illegal package{%#v}", pkg)

‎rpc/pool.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ func (c *gettyRPCClient) close() error {
228228

229229
var (
230230
gettyClient getty.Client
231-
sessions []*rpcSession
231+
sessions []*rpcSession
232232
)
233233
func() {
234234
c.lock.Lock()
@@ -237,7 +237,7 @@ func (c *gettyRPCClient) close() error {
237237
gettyClient = c.gettyClient
238238
c.gettyClient = nil
239239

240-
sessions = make([]*rpcSession, 0 , len(c.sessions))
240+
sessions = make([]*rpcSession, 0, len(c.sessions))
241241
for _, s := range c.sessions {
242242
sessions = append(sessions, s)
243243
}

‎server.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424

2525
import (
2626
log "github.com/AlexStocks/log4go"
27+
"github.com/dubbogo/gost/net"
2728
"github.com/gorilla/websocket"
2829
jerrors "github.com/juju/errors"
2930
)
@@ -214,7 +215,7 @@ func (s *server) accept(newSession NewSessionCallback) (Session, error) {
214215
if err != nil {
215216
return nil, jerrors.Trace(err)
216217
}
217-
if IsSameAddr(conn.RemoteAddr(), conn.LocalAddr()) {
218+
if gxnet.IsSameAddr(conn.RemoteAddr(), conn.LocalAddr()) {
218219
log.Warn("conn.localAddr{%s} == conn.RemoteAddr", conn.LocalAddr().String(), conn.RemoteAddr().String())
219220
return nil, errSelfConnect
220221
}

‎session.go

+19-13
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@ import (
2525
gxsync "github.com/dubbogo/gost/sync"
2626
"github.com/gorilla/websocket"
2727
jerrors "github.com/juju/errors"
28-
)
2928

30-
import (
31-
gxtime "github.com/dubbogo/gost/time"
3229
log "github.com/AlexStocks/log4go"
30+
"github.com/dubbogo/gost/context"
31+
gxtime "github.com/dubbogo/gost/time"
3332
)
3433

3534
const (
36-
maxReadBufLen = 4 * 1024
37-
netIOTimeout = 1e9 // 1s
38-
period = 60 * 1e9 // 1 minute
39-
pendingDuration = 3e9
40-
defaultQLen = 1024
41-
maxIovecNum = 10
35+
maxReadBufLen = 4 * 1024
36+
netIOTimeout = 1e9 // 1s
37+
period = 60 * 1e9 // 1 minute
38+
pendingDuration = 3e9
39+
defaultQLen = 1024
40+
maxIovecNum = 10
41+
MaxWheelTimeSpan = 900e9 // 900s, 15 minute
4242

4343
defaultSessionName = "session"
4444
defaultTCPSessionName = "tcp-session"
@@ -53,9 +53,15 @@ const (
5353
/////////////////////////////////////////
5454

5555
var (
56-
wheel = gxtime.NewWheel(gxtime.TimeMillisecondDuration(100), 1200) // wheel longest span is 2 minute
56+
wheel *gxtime.Wheel
5757
)
5858

59+
func init() {
60+
span := 100e6 // 100ms
61+
buckets := MaxWheelTimeSpan / span
62+
wheel = gxtime.NewWheel(time.Duration(span), int(buckets)) // wheel longest span is 30 minute
63+
}
64+
5965
func GetTimeWheel() *gxtime.Wheel {
6066
return wheel
6167
}
@@ -90,7 +96,7 @@ type session struct {
9096
done chan struct{}
9197

9298
// attribute
93-
attrs *ValuesContext
99+
attrs *gxcontext.ValuesContext
94100

95101
// goroutines sync
96102
grNum int32
@@ -112,7 +118,7 @@ func newSession(endPoint EndPoint, conn Connection) *session {
112118

113119
done: make(chan struct{}),
114120
wait: pendingDuration,
115-
attrs: NewValuesContext(nil),
121+
attrs: gxcontext.NewValuesContext(nil),
116122
rDone: make(chan struct{}),
117123
}
118124

@@ -153,7 +159,7 @@ func (s *session) Reset() {
153159
s.done = make(chan struct{})
154160
s.period = period
155161
s.wait = pendingDuration
156-
s.attrs = NewValuesContext(nil)
162+
s.attrs = gxcontext.NewValuesContext(nil)
157163
s.rDone = make(chan struct{})
158164
s.grNum = 0
159165

‎utils.go

-80
This file was deleted.

‎version.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ package getty
1111

1212
const (
1313
Version = "1.1.3"
14-
DATE = "2020/01/10"
14+
DATE = "2020/01/11"
1515
GETTY_MAJOR = 1
1616
GETTY_MINOR = 1
17-
GETTY_BUILD = 2
17+
GETTY_BUILD = 3
1818
)

0 commit comments

Comments
 (0)