TRKJ/EdgeNode
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeNode.git synced 2025-11-05 01:20:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化计数器性能

Browse Source
This commit is contained in:
GoEdgeLab
2023-12-25 16:41:07 +08:00
parent f10ce36feb
commit 5b6f572a47
3 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/utils/counters/counter.go
View File

@@ -22,7 +22,7 @@ type SupportedUIntType interface {
type Counter[T SupportedUIntType] struct { type Counter[T SupportedUIntType] struct {
countMaps uint64 countMaps uint64
locker *syncutils.RWMutex locker *syncutils.RWMutex
itemMaps []map[uint64]*Item[T] itemMaps []map[uint64]Item[T]
gcTicker *time.Ticker gcTicker *time.Ticker
gcIndex int gcIndex int
@@ -36,9 +36,9 @@ func NewCounter[T SupportedUIntType]() *Counter[T] {
count = 8 count = 8
} }
var itemMaps = []map[uint64]*Item[T]{} var itemMaps = []map[uint64]Item[T]{}
for i := 0; i < count; i++ { for i := 0; i < count; i++ {
itemMaps = append(itemMaps, map[uint64]*Item[T]{}) itemMaps = append(itemMaps, map[uint64]Item[T]{})
} }
var counter = &Counter[T]{ var counter = &Counter[T]{
@@ -69,19 +69,22 @@ func (this *Counter[T]) WithGC() *Counter[T] {
func (this *Counter[T]) Increase(key uint64, lifeSeconds int) T { func (this *Counter[T]) Increase(key uint64, lifeSeconds int) T {
var index = int(key % this.countMaps) var index = int(key % this.countMaps)
this.locker.RLock(index) this.locker.RLock(index)
var item = this.itemMaps[index][key] var item = this.itemMaps[index][key] // item MUST NOT be pointer
this.locker.RUnlock(index) this.locker.RUnlock(index)
if item == nil { if !item.IsOk() {
// no need to care about duplication // no need to care about duplication
// always insert new item even when itemMap is full // always insert new item even when itemMap is full
item = NewItem[T](lifeSeconds) item = NewItem[T](lifeSeconds)
var result = item.Increase()
this.locker.Lock(index) this.locker.Lock(index)
this.itemMaps[index][key] = item this.itemMaps[index][key] = item
this.locker.Unlock(index) this.locker.Unlock(index)
return result
} }
this.locker.Lock(index) this.locker.Lock(index)
var result = item.Increase() var result = item.Increase()
this.itemMaps[index][key] = item // overwrite
this.locker.Unlock(index) this.locker.Unlock(index)
return result return result
} }
@@ -97,7 +100,7 @@ func (this *Counter[T]) Get(key uint64) T {
this.locker.RLock(index) this.locker.RLock(index)
defer this.locker.RUnlock(index) defer this.locker.RUnlock(index)
var item = this.itemMaps[index][key] var item = this.itemMaps[index][key]
if item != nil { if item.IsOk() {
return item.Sum() return item.Sum()
} }
return 0 return 0
@@ -115,7 +118,7 @@ func (this *Counter[T]) Reset(key uint64) {
var item = this.itemMaps[index][key] var item = this.itemMaps[index][key]
this.locker.RUnlock(index) this.locker.RUnlock(index)
if item != nil { if item.IsOk() {
this.locker.Lock(index) this.locker.Lock(index)
delete(this.itemMaps[index], key) delete(this.itemMaps[index], key)
this.locker.Unlock(index) this.locker.Unlock(index)

9
internal/utils/counters/counter_test.go
View File

@@ -101,7 +101,7 @@ func TestCounterMemory(t *testing.T) {
var costSeconds = time.Since(before).Seconds() var costSeconds = time.Since(before).Seconds()
var stats = &debug.GCStats{} var stats = &debug.GCStats{}
debug.ReadGCStats(stats) debug.ReadGCStats(stats)
t.Log("GC pause:", stats.PauseTotal.Seconds()*1000, "ms", "cost:", costSeconds*1000, "ms") t.Log("GC pause:", stats.Pause[0].Seconds()*1000, "ms", "cost:", costSeconds*1000, "ms")
} }
gcPause() gcPause()
@@ -113,12 +113,14 @@ func BenchmarkCounter_Increase(b *testing.B) {
runtime.GOMAXPROCS(4) runtime.GOMAXPROCS(4)
var counter = counters.NewCounter[uint32]() var counter = counters.NewCounter[uint32]()
b.ReportAllocs()
b.ResetTimer() b.ResetTimer()
var i uint64 var i uint64
b.RunParallel(func(pb *testing.PB) { b.RunParallel(func(pb *testing.PB) {
for pb.Next() { for pb.Next() {
counter.Increase(atomic.AddUint64(&i, 1)%1e6, 20) counter.Increase(atomic.AddUint64(&i, 1)%1_000_000, 20)
} }
}) })
@@ -138,11 +140,12 @@ func BenchmarkCounter_IncreaseKey(b *testing.B) {
}() }()
b.ResetTimer() b.ResetTimer()
b.ReportAllocs()
var i uint64 var i uint64
b.RunParallel(func(pb *testing.PB) { b.RunParallel(func(pb *testing.PB) {
for pb.Next() { for pb.Next() {
counter.IncreaseKey(types.String(atomic.AddUint64(&i, 1)%1e6), 20) counter.IncreaseKey(types.String(atomic.AddUint64(&i, 1)%1_000_000), 20)
} }
}) })

8
internal/utils/counters/item.go
View File

@@ -16,7 +16,7 @@ type Item[T SupportedUIntType] struct {
spanSeconds int64 spanSeconds int64
} }
func NewItem[T SupportedUIntType](lifeSeconds int) *Item[T] { func NewItem[T SupportedUIntType](lifeSeconds int) Item[T] {
if lifeSeconds <= 0 { if lifeSeconds <= 0 {
lifeSeconds = 60 lifeSeconds = 60
} }
@@ -27,7 +27,7 @@ func NewItem[T SupportedUIntType](lifeSeconds int) *Item[T] {
spanSeconds++ spanSeconds++
} }
return &Item[T]{ return Item[T]{
lifeSeconds: int64(lifeSeconds), lifeSeconds: int64(lifeSeconds),
spanSeconds: int64(spanSeconds), spanSeconds: int64(spanSeconds),
lastUpdateTime: fasttime.Now().Unix(), lastUpdateTime: fasttime.Now().Unix(),
@@ -126,3 +126,7 @@ func (this *Item[T]) calculateSpanIndex(timestamp int64) int {
} }
return index return index
} }
func (this *Item[T]) IsOk() bool {
return this.lifeSeconds > 0
}