Commit c097d154 authored by alexstocks's avatar alexstocks

add remark

parent 567fa0c4
......@@ -11,6 +11,11 @@
## develop history ##
---
- 2016/09/18
> 1 close Session{rQ} in session.go:(Session)handlePackage
>
> 2 version: 0.3.09
- 2016/09/12
> 1 add defeat self connection logic in client.go & server.go
>
......
......@@ -356,6 +356,7 @@ func (this *Session) handleLoop() {
var (
err error
flag bool
rQFlag bool
// start time.Time
counter CountWatch
ticker *time.Ticker
......@@ -401,14 +402,16 @@ LOOP:
}
}
case inPkg = <-this.rQ:
case inPkg, rQFlag = <-this.rQ:
// 这个条件分支通过(Session)rQ排空确保(Session)handlePackage gr不会阻塞在(Session)rQ上
if rQFlag {
if flag {
this.listener.OnMessage(this, inPkg)
this.incReadPkgCount()
} else {
log.Info("[session.handleLoop] drop readin package{%#v}", inPkg)
}
}
case outPkg = <-this.wQ:
if flag {
......@@ -459,11 +462,12 @@ func (this *Session) handlePackage() {
}
this.stop()
close(this.rQ)
// close(this.readerDone)
grNum = atomic.AddInt32(&(this.grNum), -1)
log.Info("%s, [session.handlePackage] gr will exit now, left gr num %d", this.sessionToken(), grNum)
if errFlag {
log.Info("%s, [session.handlePackage] errFlag", this.sessionToken())
log.Error("%s, [session.handlePackage] error{%#v}", this.sessionToken(), err)
this.listener.OnError(this, err)
}
}()
......@@ -524,7 +528,7 @@ func (this *Session) handlePackage() {
func (this *Session) stop() {
select {
case <-this.done:
case <-this.done: // this.done is a blocked channel. if it has not been closed, the default branch will be invoked.
return
default:
......@@ -543,7 +547,7 @@ func (this *Session) gc() {
// }
close(this.wQ)
this.wQ = nil
close(this.rQ)
// close(this.rQ)
this.rQ = nil
this.gettyConn.close((int)((int64)(this.wait)))
}
......@@ -554,6 +558,5 @@ func (this *Session) gc() {
// It is goroutine-safe to be invoked many times.
func (this *Session) Close() {
this.stop()
log.Info("%s closed now, its current gr num %d",
this.sessionToken(), atomic.LoadInt32(&(this.grNum)))
log.Info("%s closed now, its current gr num %d", this.sessionToken(), atomic.LoadInt32(&(this.grNum)))
}
......@@ -10,5 +10,5 @@
package getty
var (
Version = "0.3.08"
Version = "0.3.09"
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment