Skip to content

fix addInternal() something unreasonable #14

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
qwb2333 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix addInternal() something unreasonable #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*.a
*.so
*.exe
.idea/*

# Folders
_test
Expand Down
36 changes: 25 additions & 11 deletions cachetable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ type CacheTable struct {
// Timer responsible for triggering cleanup.
cleanupTimer *time.Timer
// Current timer duration.
cleanupInterval time.Duration
cleanupStartAt *time.Time

// The logger used for this table.
logger *log.Logger
Expand Down Expand Up @@ -93,9 +93,10 @@ func (table *CacheTable) expirationCheck() {
table.Lock()
if table.cleanupTimer != nil {
table.cleanupTimer.Stop()
table.cleanupTimer = nil
}
if table.cleanupInterval > 0 {
table.log("Expiration check triggered after", table.cleanupInterval, "for table", table.name)
if table.cleanupStartAt != nil {
table.log("Expiration check triggered on", table.cleanupStartAt, "for table", table.name)
} else {
table.log("Expiration check installed for table", table.name)
}
Expand Down Expand Up @@ -126,13 +127,22 @@ func (table *CacheTable) expirationCheck() {
}

// Setup the interval for the next cleanup run.
table.cleanupInterval = smallestDuration
if smallestDuration > 0 {
table.cleanupTimer = time.AfterFunc(smallestDuration, func() {
now = now.Add(smallestDuration)
table.cleanupStartAt = &now
table.addExpirationCheck()
table.Unlock()
}

func (table *CacheTable) addExpirationCheck() {
if table.cleanupStartAt != nil {
duration := table.cleanupStartAt.Sub(time.Now())
if duration < 0 {
return
}
table.cleanupTimer = time.AfterFunc(duration, func() {
go table.expirationCheck()
})
}
table.Unlock()
}

func (table *CacheTable) addInternal(item *CacheItem) {
Expand All @@ -142,7 +152,6 @@ func (table *CacheTable) addInternal(item *CacheItem) {
table.items[item.key] = item

// Cache values so we don't keep blocking the mutex.
expDur := table.cleanupInterval
addedItem := table.addedItem
table.Unlock()

Expand All @@ -152,9 +161,13 @@ func (table *CacheTable) addInternal(item *CacheItem) {
}

// If we haven't set up any expiration check timer or found a more imminent item.
if item.lifeSpan > 0 && (expDur == 0 || item.lifeSpan < expDur) {
table.expirationCheck()
table.Lock()
now := time.Now().Add(item.lifeSpan)
if item.lifeSpan > 0 && (table.cleanupStartAt == nil || now.Before(*table.cleanupStartAt)) {
table.cleanupStartAt = &now
table.addExpirationCheck()
}
table.Unlock()
}

// Add adds a key/value pair to the cache.
Expand Down Expand Up @@ -271,9 +284,10 @@ func (table *CacheTable) Flush() {
table.log("Flushing table", table.name)

table.items = make(map[interface{}]*CacheItem)
table.cleanupInterval = 0
table.cleanupStartAt = nil
if table.cleanupTimer != nil {
table.cleanupTimer.Stop()
table.cleanupTimer = nil
}
}

Expand Down