Ma/origin
1
0
Fork 0
mirror of https://github.com/duanhf2012/origin.git synced 2026-02-03 22:45:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化定时器AfterTimer

Browse Source
This commit is contained in:
boyce
2021-01-15 15:39:14 +08:00
parent 3e47d2da3a
commit b131aec097
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
service/module.go
View File

@@ -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{}{}
}

24
util/timer/timer.go
View File

@@ -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