lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-09-29 07:16:29 -04:00
Code Issues Releases Wiki Activity

simplify validity map

Browse Source
This commit is contained in:
v2ray 2016-02-01 23:21:44 +01:00
parent 5df2a1c6e6
commit 526c4558ca
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
common/collect/validity_map.go
View File

@ -2,7 +2,7 @@ package collect
import ( import (
"sync" "sync"
"time" "sync/atomic"
"github.com/v2ray/v2ray-core/common/serial" "github.com/v2ray/v2ray-core/common/serial"
) )
@ -18,39 +18,35 @@ type entry struct {
type ValidityMap struct { type ValidityMap struct {
sync.RWMutex sync.RWMutex
cache map[string]Validity cache map[string]Validity
cleanupIntervalSec int opCount int32
} }
func NewValidityMap(cleanupIntervalSec int) *ValidityMap { func NewValidityMap(cleanupIntervalSec int) *ValidityMap {
instance := &ValidityMap{ instance := &ValidityMap{
cache: make(map[string]Validity), cache: make(map[string]Validity),
cleanupIntervalSec: cleanupIntervalSec,
} }
go instance.cleanup()
return instance return instance
} }
func (this *ValidityMap) cleanup() { func (this *ValidityMap) cleanup() {
for range time.Tick(time.Duration(this.cleanupIntervalSec) * time.Second) { entry2Remove := make([]entry, 0, 128)
entry2Remove := make([]entry, 0, 128) this.RLock()
this.RLock() for key, value := range this.cache {
for key, value := range this.cache { if !value.IsValid() {
if !value.IsValid() { entry2Remove = append(entry2Remove, entry{
entry2Remove = append(entry2Remove, entry{ key: key,
key: key, value: value,
value: value, })
})
}
} }
this.RUnlock() }
this.RUnlock()
for _, entry := range entry2Remove { for _, entry := range entry2Remove {
if !entry.value.IsValid() { if !entry.value.IsValid() {
this.Lock() this.Lock()
delete(this.cache, entry.key) delete(this.cache, entry.key)
this.Unlock() this.Unlock()
}
} }
} }
} }
@ -59,6 +55,11 @@ func (this *ValidityMap) Set(key serial.String, value Validity) {
this.Lock() this.Lock()
this.cache[key.String()] = value this.cache[key.String()] = value
this.Unlock() this.Unlock()
opCount := atomic.AddInt32(&this.opCount, 1)
if opCount > 1000 {
atomic.StoreInt32(&this.opCount, 0)
go this.cleanup()
}
} }
func (this *ValidityMap) Get(key serial.String) Validity { func (this *ValidityMap) Get(key serial.String) Validity {