定时器结构修改

utils/timer/constants.go

@@ -2,7 +2,12 @@ package timer
 
 import "time"
 
-var (
+const (
-	// 时间轮一刻度长度
+	timingWheelTick = time.Millisecond * 10 // 时间轮一刻度长度
-	timingWheelTick = time.Millisecond * 10
+)
+
+const (
+	Forever   = -1 //  无限循环
+	Once      = 1  // 一次
+	Instantly = 0  // 立刻
 )

utils/timer/scheduler.go

@@ -23,7 +23,7 @@ type Scheduler struct {
 
 	timer *timingwheel.Timer
 
-	manager *Manager
+	ticker *Ticker
 
 	lock sync.RWMutex
 }
@@ -65,7 +65,7 @@ func (slf *Scheduler) Caller() {
 	slf.trigger++
 	if slf.total > 0 && slf.trigger >= slf.total {
 		slf.lock.Unlock()
-		slf.manager.StopTimer(slf.name)
+		slf.ticker.StopTimer(slf.name)
 	} else {
 		slf.lock.Unlock()
 	}

utils/timer/ticker.go

@@ -8,8 +8,8 @@ import (
 	"github.com/RussellLuo/timingwheel"
 )
 
-// Manager 管理器
+// Ticker 管理器
-type Manager struct {
+type Ticker struct {
 	timer  *Timer
 	wheel  *timingwheel.TimingWheel
 	timers map[string]*Scheduler
@@ -17,7 +17,7 @@ type Manager struct {
 }
 
 // Release 释放管理器，并将管理器重新放回 Timer 池中
-func (slf *Manager) Release() {
+func (slf *Ticker) Release() {
 	slf.timer.lock.Lock()
 	defer slf.timer.lock.Unlock()
 
@@ -30,11 +30,11 @@ func (slf *Manager) Release() {
 
 	slf.lock.Unlock()
 
-	slf.timer.Managers = append(slf.timer.Managers, slf)
+	slf.timer.tickers = append(slf.timer.tickers, slf)
 }
 
 // StopTimer 停止特定名称的调度器
-func (slf *Manager) StopTimer(name string) {
+func (slf *Ticker) StopTimer(name string) {
 	slf.lock.Lock()
 	defer slf.lock.Unlock()
 
@@ -45,7 +45,7 @@ func (slf *Manager) StopTimer(name string) {
 }
 
 // IsStopped 特定名称的调度器是否已停止
-func (slf *Manager) IsStopped(name string) bool {
+func (slf *Ticker) IsStopped(name string) bool {
 	slf.lock.RLock()
 	defer slf.lock.RUnlock()
 	if s, ok := slf.timers[name]; ok {
@@ -55,7 +55,7 @@ func (slf *Manager) IsStopped(name string) bool {
 }
 
 // GetSchedulers 获取所有调度器名称
-func (slf *Manager) GetSchedulers() []string {
+func (slf *Ticker) GetSchedulers() []string {
 	slf.lock.RLock()
 	defer slf.lock.RUnlock()
 	names := make([]string, 0, len(slf.timers))
@@ -66,12 +66,12 @@ func (slf *Manager) GetSchedulers() []string {
 }
 
 // After 设置一个在特定时间后运行一次的调度器
-func (slf *Manager) After(name string, after time.Duration, handleFunc interface{}, args ...interface{}) {
+func (slf *Ticker) After(name string, after time.Duration, handleFunc interface{}, args ...interface{}) {
 	slf.Loop(name, after, timingWheelTick, 1, handleFunc, args...)
 }
 
-// Loop 设置一个在特定时间后仿佛运行的调度器
+// Loop 设置一个在特定时间后反复运行的调度器
-func (slf *Manager) Loop(name string, after, interval time.Duration, times int, handleFunc interface{}, args ...interface{}) {
+func (slf *Ticker) Loop(name string, after, interval time.Duration, times int, handleFunc interface{}, args ...interface{}) {
 	slf.StopTimer(name)
 
 	if after < timingWheelTick {
@@ -93,7 +93,7 @@ func (slf *Manager) Loop(name string, after, interval time.Duration, times int,
 		total:    times,
 		cbFunc:   reflect.ValueOf(handleFunc),
 		cbArgs:   values,
-		manager:  slf,
+		ticker:   slf,
 	}
 
 	slf.lock.Lock()
@@ -101,4 +101,3 @@ func (slf *Manager) Loop(name string, after, interval time.Duration, times int,
 	scheduler.timer = slf.wheel.ScheduleFunc(scheduler, scheduler.caller)
 	slf.lock.Unlock()
 }
-

utils/timer/timer.go

@@ -8,31 +8,31 @@ import (
 
 var timer = new(Timer)
 
-func GetManager(size int) *Manager {
+func GetTicker(size int) *Ticker {
-	return timer.NewManager(size)
+	return timer.NewTicker(size)
 }
 
 type Timer struct {
-	Managers []*Manager
+	tickers []*Ticker
-	lock     sync.Mutex
+	lock    sync.Mutex
 }
 
-func (slf *Timer) NewManager(size int) *Manager {
+func (slf *Timer) NewTicker(size int) *Ticker {
 	slf.lock.Lock()
 	defer slf.lock.Unlock()
 
-	var manager *Manager
+	var ticker *Ticker
-	if len(slf.Managers) > 0 {
+	if len(slf.tickers) > 0 {
-		manager = slf.Managers[0]
+		ticker = slf.tickers[0]
-		slf.Managers = slf.Managers[1:]
+		slf.tickers = slf.tickers[1:]
-		return manager
+		return ticker
 	}
 
-	manager = &Manager{
+	ticker = &Ticker{
 		timer:  slf,
 		wheel:  timingwheel.NewTimingWheel(timingWheelTick, int64(size)),
 		timers: make(map[string]*Scheduler),
 	}
-	manager.wheel.Start()
+	ticker.wheel.Start()
-	return manager
+	return ticker
 }