From ce925b40aa2b89ffc2291744cf1960feaa7e0dbe Mon Sep 17 00:00:00 2001
From: xtaci <daniel820313@gmail.com>
Date: Thu, 1 Sep 2016 12:36:38 +0800
Subject: [PATCH] add a close lock for stream

---
 session.go | 18 +++++++++---------
 stream.go  | 16 +++++++++-------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/session.go b/session.go
index eddded0..877b89f 100644
--- a/session.go
+++ b/session.go
@@ -31,11 +31,11 @@ type Session struct {
 	tbf         chan struct{}      // tokenbuffer
 	frameQueues map[uint32][]Frame // stream input frame queue
 
-	die       chan struct{} // flag session has died
-	chAccepts chan *Stream
-	chClose   chan uint32
-	dataReady int32 // flag data has arrived
-	mu        sync.Mutex
+	die           chan struct{} // flag session has died
+	chAccepts     chan *Stream
+	chActiveClose chan uint32
+	dataReady     int32 // flag data has arrived
+	mu            sync.Mutex
 }
 
 func newSession(conn io.ReadWriteCloser, client bool, maxframes int, framesize uint16) *Session {
@@ -47,7 +47,7 @@ func newSession(conn io.ReadWriteCloser, client bool, maxframes int, framesize u
 	s.frameQueues = make(map[uint32][]Frame)
 	s.rdEvents = make(map[uint32]chan struct{})
 	s.chAccepts = make(chan *Stream, defaultAcceptBacklog)
-	s.chClose = make(chan uint32, defaultCloseWait)
+	s.chActiveClose = make(chan uint32, defaultCloseWait)
 	s.die = make(chan struct{})
 	for i := 0; i < maxframes; i++ {
 		s.tbf <- struct{}{}
@@ -130,8 +130,8 @@ func (s *Session) NumStreams() int {
 }
 
 // notify the session that a session has closed
-func (s *Session) streamClose(sid uint32) {
-	s.chClose <- sid
+func (s *Session) streamActiveClose(sid uint32) {
+	s.chActiveClose <- sid
 }
 
 // nonblocking read from session pool, for streams
@@ -175,7 +175,7 @@ func (s *Session) readFrame(buffer []byte) (f Frame, err error) {
 func (s *Session) monitor() {
 	for {
 		select {
-		case sid := <-s.chClose:
+		case sid := <-s.chActiveClose:
 			s.mu.Lock()
 			delete(s.streams, sid)
 			delete(s.rdEvents, sid)
diff --git a/stream.go b/stream.go
index 8e33c7f..2f48a80 100644
--- a/stream.go
+++ b/stream.go
@@ -14,9 +14,10 @@ type Stream struct {
 	chNotifyReader chan struct{}
 	sess           *Session
 	frameSize      uint16
-	die            chan struct{}
-	rlock          sync.Mutex
-	buffer         []byte
+	rlock          sync.Mutex    // read lock
+	buffer         []byte        // temporary store of remaining frame.data
+	die            chan struct{} // flag the stream has closed
+	dieLock        sync.Mutex
 }
 
 // newStream initiates a Stream struct
@@ -94,15 +95,16 @@ func (s *Stream) Write(b []byte) (n int, err error) {
 
 // Close implements io.ReadWriteCloser
 func (s *Stream) Close() error {
+	s.dieLock.Lock()
+	defer s.dieLock.Unlock()
+
 	select {
 	case <-s.die:
 		return errors.New(errBrokenPipe)
 	default:
 		close(s.die)
-		s.sess.streamClose(s.id)
-		f := newFrame(cmdRST, s.id)
-		bts, _ := f.MarshalBinary()
-		s.sess.conn.Write(bts)
+		s.sess.streamActiveClose(s.id)
+		s.sess.sendFrame(newFrame(cmdRST, s.id))
 	}
 	return nil
 }