From b131aec097429f6bf7b3eacceed7ff63ddc87646 Mon Sep 17 00:00:00 2001
From: boyce <boyce@atbc.com>
Date: Fri, 15 Jan 2021 15:39:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=9A=E6=97=B6=E5=99=A8Af?=
 =?UTF-8?q?terTimer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/module.go   |  2 +-
 util/timer/timer.go | 24 +++++++++++-------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/service/module.go b/service/module.go
index 3b24d80..77940a0 100644
--- a/service/module.go
+++ b/service/module.go
@@ -172,7 +172,7 @@ func (m *Module) OnAddTimer(t *timer.Timer){
 	}
 }
 
-func (m *Module) AfterFunc(d time.Duration, cb func()) *timer.Timer {
+func (m *Module) AfterFunc(d time.Duration, cb func(*timer.Timer)) *timer.Timer {
 	if m.mapActiveTimer == nil {
 		m.mapActiveTimer =map[*timer.Timer]interface{}{}
 	}
diff --git a/util/timer/timer.go b/util/timer/timer.go
index 8145ba6..1508a4c 100644
--- a/util/timer/timer.go
+++ b/util/timer/timer.go
@@ -97,7 +97,7 @@ func (t *Timer) Do(){
 func (t *Timer) SetupTimer(now time.Time) error{
 	t.fireTime = now.Add(t.interval)
 	if SetupTimer(t) == nil {
-		return fmt.Errorf("Failed to install timer.")
+		return fmt.Errorf("failed to install timer")
 	}
 	return nil
 }
@@ -171,18 +171,16 @@ func (c *Ticker) UnRef(){
 	c.ref = false
 }
 
-
-
 func NewDispatcher(l int) *Dispatcher {
-	disp := new(Dispatcher)
-	disp.ChanTimer = make(chan *Timer, l)
-	return disp
+	dispatcher := new(Dispatcher)
+	dispatcher.ChanTimer = make(chan *Timer, l)
+	return dispatcher
 }
 
 type OnTimerClose func(timer *Timer)
-func (disp *Dispatcher) AfterFunc(d time.Duration, cb func(),onTimerClose OnTimerClose,onAddTimer func(timer *Timer)) *Timer {
+func (dispatcher *Dispatcher) AfterFunc(d time.Duration, cb func(*Timer),onTimerClose OnTimerClose,onAddTimer func(timer *Timer)) *Timer {
 	funName :=  runtime.FuncForPC(reflect.ValueOf(cb).Pointer()).Name()
-	timer := newTimer(d,disp.ChanTimer,cb,funName,nil)
+	timer := newTimer(d,dispatcher.ChanTimer,nil,funName,nil)
 	cbFunc := func() {
 		if timer.IsActive() == false {
 			onTimerClose(timer)
@@ -190,7 +188,7 @@ func (disp *Dispatcher) AfterFunc(d time.Duration, cb func(),onTimerClose OnTime
 			return
 		}
 
-		cb()
+		cb(timer)
 
 		if timer.rOpen ==false {
 			onTimerClose(timer)
@@ -205,7 +203,7 @@ func (disp *Dispatcher) AfterFunc(d time.Duration, cb func(),onTimerClose OnTime
 	return t
 }
 
-func (disp *Dispatcher) CronFunc(cronExpr *CronExpr, cb func(*Cron),onTimerClose OnTimerClose,onAddTimer func(timer *Timer))  *Cron {
+func (dispatcher *Dispatcher) CronFunc(cronExpr *CronExpr, cb func(*Cron),onTimerClose OnTimerClose,onAddTimer func(timer *Timer))  *Cron {
 	now := Now()
 	nextTime := cronExpr.Next(now)
 	if nextTime.IsZero() {
@@ -235,7 +233,7 @@ func (disp *Dispatcher) CronFunc(cronExpr *CronExpr, cb func(*Cron),onTimerClose
 		SetupTimer(&cron.Timer)
 		cb(cron)
 	}
-	cron.C = disp.ChanTimer
+	cron.C = dispatcher.ChanTimer
 	cron.cb = cbFunc
 	cron.name = funcName
 	cron.interval = nextTime.Sub(now)
@@ -245,7 +243,7 @@ func (disp *Dispatcher) CronFunc(cronExpr *CronExpr, cb func(*Cron),onTimerClose
 	return cron
 }
 
-func (disp *Dispatcher) TickerFunc(d time.Duration, cb func(*Ticker),onTimerClose OnTimerClose,onAddTimer func(timer *Timer))  *Ticker {
+func (dispatcher *Dispatcher) TickerFunc(d time.Duration, cb func(*Ticker),onTimerClose OnTimerClose,onAddTimer func(timer *Timer))  *Ticker {
 	funcName :=  runtime.FuncForPC(reflect.ValueOf(cb).Pointer()).Name()
 	ticker := newTicker()
 	cbFunc := func() {
@@ -259,7 +257,7 @@ func (disp *Dispatcher) TickerFunc(d time.Duration, cb func(*Ticker),onTimerClos
 		}
 	}
 
-	ticker.C = disp.ChanTimer
+	ticker.C = dispatcher.ChanTimer
 	ticker.fireTime = Now().Add(d)
 	ticker.cb = cbFunc
 	ticker.name = funcName