Skip to content

Fix bucket.Flush and the not thread-safe issue between tw.add and tw.advanceClock #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yunlong0928 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix bucket.Flush and the not thread-safe issue between tw.add and tw.advanceClock #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3172c30
Fix bucket.Flush
Jan 22, 2021
2b2e27a
Fix the not thread-safe issue between tw.add and tw.advanceClock
Feb 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions bucket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,9 @@ func (b *bucket) Flush(reinsert func(*Timer)) {

e = next
}
b.SetExpiration(-1)
b.mu.Unlock()

b.SetExpiration(-1) // TODO: Improve the coordination with b.Add()

for _, t := range ts {
reinsert(t)
}
Expand Down
11 changes: 10 additions & 1 deletion timingwheel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@ package timingwheel

import (
"errors"
"sync"
"sync/atomic"
"time"
"unsafe"

"github.com/RussellLuo/timingwheel/delayqueue"
)

var rwlock *sync.RWMutex

// TimingWheel is an implementation of Hierarchical Timing Wheels.
type TimingWheel struct {
tick int64 // in milliseconds
Expand Down Expand Up @@ -109,7 +112,10 @@ func (tw *TimingWheel) add(t *Timer) bool {
// addOrRun inserts the timer t into the current timing wheel, or run the
// timer's task if it has already expired.
func (tw *TimingWheel) addOrRun(t *Timer) {
if !tw.add(t) {
rwlock.RLock()
notExpired := tw.add(t)
rwlock.RUnlock()
if !notExpired {
// Already expired

// Like the standard time.AfterFunc (https://golang.org/pkg/time/#AfterFunc),
Expand All @@ -134,6 +140,7 @@ func (tw *TimingWheel) advanceClock(expiration int64) {

// Start starts the current timing wheel.
func (tw *TimingWheel) Start() {
rwlock = new(sync.RWMutex)
tw.waitGroup.Wrap(func() {
tw.queue.Poll(tw.exitC, func() int64 {
return timeToMs(time.Now().UTC())
Expand All @@ -145,7 +152,9 @@ func (tw *TimingWheel) Start() {
select {
case elem := <-tw.queue.C:
b := elem.(*bucket)
rwlock.Lock()
tw.advanceClock(b.Expiration())
rwlock.Unlock()
b.Flush(tw.addOrRun)
case <-tw.exitC:
return
Expand Down