chenyh
/
vRp.CD2g_test
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 修复 timer.Ticker 并发问题

This commit is contained in:
kercylan98 2024-03-11 17:25:06 +08:00
parent 17cdad2c6e
commit d1d5bd40d4
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utils/timer/options.go
View File

@ -3,9 +3,11 @@ package timer
type Option func(ticker *Ticker) type Option func(ticker *Ticker)
// WithCaller 通过其他的 handler 执行 Caller // WithCaller 通过其他的 handler 执行 Caller
func WithCaller(handle func(name string, caller func())) Option { func WithCaller(handler func(name string, caller func())) Option {
return func(ticker *Ticker) { return func(ticker *Ticker) {
ticker.handler = handle ticker.lock.Lock()
ticker.handler = handler
ticker.lock.Unlock()
} }
} }

6
utils/timer/ticker.go
View File

@ -150,7 +150,11 @@ func (slf *Ticker) loop(name string, after, interval time.Duration, expr *cronex
slf.timers[name] = scheduler slf.timers[name] = scheduler
if slf.handler != nil { if slf.handler != nil {
scheduler.timer = slf.wheel.ScheduleFunc(scheduler, func() { scheduler.timer = slf.wheel.ScheduleFunc(scheduler, func() {
slf.handler(scheduler.Name(), scheduler.Caller) slf.lock.RLock()
defer slf.lock.RUnlock()
if slf.handler != nil {
slf.handler(scheduler.Name(), scheduler.Caller)
}
}) })
} else { } else {
scheduler.timer = slf.wheel.ScheduleFunc(scheduler, scheduler.Caller) scheduler.timer = slf.wheel.ScheduleFunc(scheduler, scheduler.Caller)