rollback close(rQ) in session.go:(Session)handlePackage

README.md

@@ -8,151 +8,3 @@
 >
 > LICENCE    : Apache License 2.0
 
-## 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
-    >
-    > 2 version: 0.3.08
-
-- 2016/09/09
-	> 1 delete session.go:(Session)readerDone
-    >
-    > 2 delete session.go:(Session)handlePackage Last clause
-    >
-    > 3 set write timeout in session.go:(Session)WritePkg
-    >
-    > 4 version: 0.3.07
-
-- 2016/09/08
-	> 1 rewrite session.go:(Session)handlePackage() error handle logic
-    >
-    > 2 add utils.go:CountWatch
-    >
-    > 3 version: 0.3.06
-
-- 2016/09/07
-	> 1 session.go:(Session)Close() -> session.go:(Session)gc() to be invoked by session.go:(Session)handleLoop
-    >
-    > 2 add panic stack message for session.go:(Session)handleLoop & session.go:(Session)handlePackage
-    >
-    > 3 version: 0.3.05
-
-- 2016/09/06
-	> 1 codec.go:(Reader)Read(*Session, []byte) (interface{}, error)  -> codec.go:(Reader)Read(*Session, []byte) (interface{}, int, error)
-	>
-    > 2 codec.go:(EventListener)OnOpen(*Session) -> codec.go:(EventListener)OnOpen(*Session) error
-	>
-    > 3 version: 0.3.04
-
-- 2016/09/05
-	> 1 add 'errFlag = true' when got err in pkgHandler.Read loop clause in session.go:(Session)handlePackage
-	>
-    > 2 use '[]byte' instead of bytes.Buffer in codec.go:(Reader)Read
-	>
-    > 3 version: 0.3.03
-
-- 2016/09/04
-	> 1 add server.go:(Server)Listen
-	>
-    > 2 version: 0.3.02
-
-- 2016/09/03
-	> 1 modify return value of session.go:(Session)Close from void to error
-	>
-    > 2 add clause "this.attrs = nil" in session.go:(Session)Close
-	>
-    > 3 session.go:Session{*gettyConn, readDeadline, writeDeadline} -> session.go:Session{gettyConn, rDeadline, wDeadline}
-	>
-    > 4 add session.go:(Session)Reset
-    >
-    > 5 add session.go:(Session)SetConn
-    >
-    > 6 add elastic sleep time machanism in client.go:(Client)RunEventLoop
-    >
-    > 7 version: 0.3.01
-
-- 2016/09/02
-	> 1 add session.go:(gettyConn)close and session.go:(Session)dispose
-	>
-    > 2 modify return value of server.go:NewSessionCallback from void to err
-	>
-    > 3 add client.go:Client
-    >
-    > 4 version: 0.3.00
-
-- 2016/08/29
-	> 1 rename reconnect to errFlag in function session.go:(Session)handlePackage
-	>
-    > 2 session.go:(gettyConn)readCount is reconsidered as read in tcp stream bytes
-	>
-    > 3 session.go:(gettyConn)writeCount is reconsidered as write out tcp stream bytes
-	>
-    > 4 reconstruct session output token string session.go:(Session)sessionToken
-	>
-    > 5 use err instead of nerr in session.go:(Session)handlePackage:defer:OnError
-	>
-   	> 6 version: 0.2.07
-
-- 2016/08/25
-	> 1 move close done to once clause in server.go:(Server)stop
-	>
-	> 2 rename reqQ to rQ which means read queue and its relative params
-	>
-	> 3 rename rspQ to wQ which means write queue and its relative params
-	>
-	> 4 rename reqPkg to inPkg in function session.go:(Session)handleLoop
-	>
-	> 5 rename rspPkg to outPkg in function session.go:(Session)handleLoop
-	>
-	> 6 version: 0.2.06
-
-- 2016/08/24
-	> 1 delete session.go:Session:wg(atomic.WaitGroup). Add session.go:Session:grNum instead to prevent from  (Session)Close() block on session.go:Session:wg.Wait()
-	>
-	> 2 add once for session.go:Session:done(chan struct{})
-	>
-	> 3 version: 0.2.05
-
-- 2016/08/23
-	> 1 do not consider empty package as a error in (Session)handlePackage
-	>
-	> 2 version: 0.2.04
-
-- 2016/08/22
-	> 1 rename (Session)OnIdle to (Session)OnCron
-	>
-	> 2 rewrite server.go: add Server{done, wg}
-	>
-	> 3 add utils.go
-	>
-	> 4 version: 0.2.03
-
-- 2016/08/21
-	> 1 add name for Session
-	>
-	> 2 add OnError for Codec
-
-- 2016/08/18
-	> 1 delete last clause of handleRead
-	>
-	> 2 add reqQ handle case in last clause of handleLoop
-	>
-	> 3 add conditon check in (*Session)RunEventLoop()
-	>
-	> 4 version: 0.2.02
-
-- 2016/08/16
-	> 1 rename all structs
-	>
-	> 2 add getty connection
-	>
-	> 3 rewrite (Session)handleRead & (Session)handleEventLoop
-	>
-	> 4 version: 0.2.01

dev.md

+# getty #
+---
+ *a netty like asynchronous network I/O library*
+
+## introdction ##
+---
+> DESC       : a asynchronous network I/O library in golang. In getty there are two goroutines in one connection(session), one handle network read buffer tcp stream, the other handle logic process and write response into network write buffer. If your logic process may take a long time, you should start a new logic process goroutine by yourself in (Codec):OnMessage. Getty is based on "ngo" whose author is sanbit(https://github.com/sanbit).
+>
+> LICENCE    : Apache License 2.0
+
+## develop history ##
+---
+
+- 2016/09/12
+	> 1 add defeat self connection logic in client.go & server.go
+    >
+    > 2 version: 0.3.08
+
+- 2016/09/09
+	> 1 delete session.go:(Session)readerDone
+    >
+    > 2 delete session.go:(Session)handlePackage Last clause
+    >
+    > 3 set write timeout in session.go:(Session)WritePkg
+    >
+    > 4 version: 0.3.07
+
+- 2016/09/08
+	> 1 rewrite session.go:(Session)handlePackage() error handle logic
+    >
+    > 2 add utils.go:CountWatch
+    >
+    > 3 version: 0.3.06
+
+- 2016/09/07
+	> 1 session.go:(Session)Close() -> session.go:(Session)gc() to be invoked by session.go:(Session)handleLoop
+    >
+    > 2 add panic stack message for session.go:(Session)handleLoop & session.go:(Session)handlePackage
+    >
+    > 3 version: 0.3.05
+
+- 2016/09/06
+	> 1 codec.go:(Reader)Read(*Session, []byte) (interface{}, error)  -> codec.go:(Reader)Read(*Session, []byte) (interface{}, int, error)
+	>
+    > 2 codec.go:(EventListener)OnOpen(*Session) -> codec.go:(EventListener)OnOpen(*Session) error
+	>
+    > 3 version: 0.3.04
+
+- 2016/09/05
+	> 1 add 'errFlag = true' when got err in pkgHandler.Read loop clause in session.go:(Session)handlePackage
+	>
+    > 2 use '[]byte' instead of bytes.Buffer in codec.go:(Reader)Read
+	>
+    > 3 version: 0.3.03
+
+- 2016/09/04
+	> 1 add server.go:(Server)Listen
+	>
+    > 2 version: 0.3.02
+
+- 2016/09/03
+	> 1 modify return value of session.go:(Session)Close from void to error
+	>
+    > 2 add clause "this.attrs = nil" in session.go:(Session)Close
+	>
+    > 3 session.go:Session{*gettyConn, readDeadline, writeDeadline} -> session.go:Session{gettyConn, rDeadline, wDeadline}
+	>
+    > 4 add session.go:(Session)Reset
+    >
+    > 5 add session.go:(Session)SetConn
+    >
+    > 6 add elastic sleep time machanism in client.go:(Client)RunEventLoop
+    >
+    > 7 version: 0.3.01
+
+- 2016/09/02
+	> 1 add session.go:(gettyConn)close and session.go:(Session)dispose
+	>
+    > 2 modify return value of server.go:NewSessionCallback from void to err
+	>
+    > 3 add client.go:Client
+    >
+    > 4 version: 0.3.00
+
+- 2016/08/29
+	> 1 rename reconnect to errFlag in function session.go:(Session)handlePackage
+	>
+    > 2 session.go:(gettyConn)readCount is reconsidered as read in tcp stream bytes
+	>
+    > 3 session.go:(gettyConn)writeCount is reconsidered as write out tcp stream bytes
+	>
+    > 4 reconstruct session output token string session.go:(Session)sessionToken
+	>
+    > 5 use err instead of nerr in session.go:(Session)handlePackage:defer:OnError
+	>
+   	> 6 version: 0.2.07
+
+- 2016/08/25
+	> 1 move close done to once clause in server.go:(Server)stop
+	>
+	> 2 rename reqQ to rQ which means read queue and its relative params
+	>
+	> 3 rename rspQ to wQ which means write queue and its relative params
+	>
+	> 4 rename reqPkg to inPkg in function session.go:(Session)handleLoop
+	>
+	> 5 rename rspPkg to outPkg in function session.go:(Session)handleLoop
+	>
+	> 6 version: 0.2.06
+
+- 2016/08/24
+	> 1 delete session.go:Session:wg(atomic.WaitGroup). Add session.go:Session:grNum instead to prevent from  (Session)Close() block on session.go:Session:wg.Wait()
+	>
+	> 2 add once for session.go:Session:done(chan struct{})
+	>
+	> 3 version: 0.2.05
+
+- 2016/08/23
+	> 1 do not consider empty package as a error in (Session)handlePackage
+	>
+	> 2 version: 0.2.04
+
+- 2016/08/22
+	> 1 rename (Session)OnIdle to (Session)OnCron
+	>
+	> 2 rewrite server.go: add Server{done, wg}
+	>
+	> 3 add utils.go
+	>
+	> 4 version: 0.2.03
+
+- 2016/08/21
+	> 1 add name for Session
+	>
+	> 2 add OnError for Codec
+
+- 2016/08/18
+	> 1 delete last clause of handleRead
+	>
+	> 2 add reqQ handle case in last clause of handleLoop
+	>
+	> 3 add conditon check in (*Session)RunEventLoop()
+	>
+	> 4 version: 0.2.02
+
+- 2016/08/16
+	> 1 rename all structs
+	>
+	> 2 add getty connection
+	>
+	> 3 rewrite (Session)handleRead & (Session)handleEventLoop
+	>
+	> 4 version: 0.2.01

session.go

@@ -462,7 +462,6 @@ 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)
@@ -547,7 +546,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)))
 	}

version.go

@@ -10,5 +10,5 @@
 package getty
 
 var (
-	Version = "0.3.09"
+	Version = "0.3.08"
 )