修复: 队列在退出时会在处理完所有事件后再结束

examples/chat/client/main.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 )
 
-var log *golog.Logger = golog.New("main")
+var log = golog.New("main")
 
 func ReadConsole(callback func(string)) {
 

examples/chat/server/main.go

@@ -7,7 +7,7 @@ import (
 	"github.com/davyxu/golog"
 )
 
-var log *golog.Logger = golog.New("main")
+var log = golog.New("main")
 
 func main() {
 	queue := cellnet.NewEventQueue()

queue.go

@@ -2,6 +2,7 @@ package cellnet
 
 import (
 	"runtime/debug"
+	"sync"
 )
 
 type EventQueue interface {
@@ -22,9 +23,11 @@ type EventQueue interface {
 type evQueue struct {
 	queue chan func()
 
-	exitSignal chan int
+	endSignal sync.WaitGroup
 
 	capturePanic bool
+
+	result int
 }
 
 func (self *evQueue) EnableCapturePanic(v bool) {
@@ -63,19 +66,30 @@ func (self *evQueue) protectedCall(callback func()) {
 
 func (self *evQueue) StartLoop() {
 
+	self.endSignal.Add(1)
+
 	go func() {
 		for callback := range self.queue {
+
+			if callback == nil {
+				break
+			}
+
 			self.protectedCall(callback)
 		}
+
+		self.endSignal.Done()
 	}()
 }
 
 func (self *evQueue) StopLoop(result int) {
-	self.exitSignal <- result
+	self.queue <- nil
+	self.result = result
 }
 
 func (self *evQueue) Wait() int {
-	return <-self.exitSignal
+	self.endSignal.Wait()
+	return self.result
 }
 
 const DefaultQueueSize = 100
@@ -87,8 +101,7 @@ func NewEventQueue() EventQueue {
 
 func NewEventQueueByLen(l int) EventQueue {
 	self := &evQueue{
-		queue:      make(chan func(), l),
-		exitSignal: make(chan int),
+		queue: make(chan func(), l),
 	}
 
 	return self