调整: 循环计时器更换为更加稳定的实现

example/classicrecv/classicrecv_test.go

@@ -47,7 +47,7 @@ func server() {
 	_, send := peer.HandlerList()
 
 	// 在原有流程中, 插入固定消息回调
-	recvList := socket.BuildRecvHandler(new(RecvMessageHandler), peer)
+	recvList := socket.BuildRecvHandler(cellnet.NewBranchHandler(new(RecvMessageHandler), peer))
 
 	peer.SetHandlerList(recvList, send)
 

example/timer/timer_test.go

@@ -37,27 +37,30 @@ func TestAfterTimer(t *testing.T) {
 	signal.WaitAndExpect("2 sec after not done", 2)
 }
 
-func TestTickerTimer(t *testing.T) {
+func TestLoopTimer(t *testing.T) {
 
 	signal := util.NewSignalTester(t)
 	signal.SetTimeout(60 * time.Second)
 
 	queue := cellnet.NewEventQueue()
 
+	// 启动消息循环
 	queue.StartLoop()
 
 	var count int
-	timer.Tick(queue, time.Millisecond*100, func(stopper timer.TickStopper) {
+
+	// 启动计时循环
+	timer.NewLoop(queue, time.Millisecond*100, func(ctx *timer.Loop) {
+
 		log.Debugln("tick 100 ms", count)
 
 		count++
 
 		if count >= 10 {
 			signal.Done(1)
-			stopper.Stop()
+			ctx.Stop()
 		}
-
-	})
+	}, nil).Start()
 
 	signal.WaitAndExpect("100ms * 10 times ticker not done", 1)
 }

timer/loop.go

@@ -0,0 +1,90 @@
+package timer
+
+import (
+	"github.com/davyxu/cellnet"
+	"time"
+)
+
+type Loop struct {
+	Context      interface{}
+	Duration     time.Duration
+	userCallback func(*Loop)
+
+	running bool
+
+	Queue cellnet.EventQueue
+}
+
+func (self *Loop) Running() bool {
+	return self.running
+}
+
+func (self *Loop) Start() bool {
+
+	if self.running {
+		return false
+	}
+
+	self.running = true
+
+	self.rawPost()
+
+	return true
+}
+
+func (self *Loop) rawPost() {
+
+	if self.Duration == 0 {
+		panic("seconds can be zero in loop")
+	}
+
+	After(self.Queue, self.Duration, func() {
+		tick(self, false)
+	})
+}
+
+func (self *Loop) NextLoop() {
+
+	self.Queue.Post(func() {
+		tick(self, true)
+	})
+}
+
+func (self *Loop) Stop() {
+
+	self.running = false
+}
+
+func (self *Loop) Notify() {
+	self.userCallback(self)
+}
+
+func tick(ctx interface{}, nextLoop bool) {
+
+	loop := ctx.(*Loop)
+
+	loop.Notify()
+
+	if !loop.running {
+		return
+	}
+
+	// 不等待, 直接跳到下一个循环
+
+	if !nextLoop {
+		loop.rawPost()
+	}
+
+}
+
+func NewLoop(q cellnet.EventQueue, duration time.Duration, callback func(*Loop), context interface{}) *Loop {
+
+	self := &Loop{
+		Context:      context,
+		Duration:     duration,
+		userCallback: callback,
+		Queue:        q,
+	}
+
+	return self
+}

websocket/textpkt.go

@@ -2,7 +2,7 @@ package websocket
 
 import "bytes"
 
-// 格式
+// 格式:  消息名\n+json文本
 
 func parsePacket(pkt []byte) (msgName string, data []byte) {