优化过期列表管理

internal/utils/expires/list_test.go

@@ -1,87 +1,89 @@
-package expires
+package expires_test
 
 import (
+	"github.com/TeaOSLab/EdgeNode/internal/utils/expires"
 	"github.com/TeaOSLab/EdgeNode/internal/utils/fasttime"
 	"github.com/TeaOSLab/EdgeNode/internal/utils/testutils"
 	"github.com/iwind/TeaGo/assert"
 	"github.com/iwind/TeaGo/logs"
 	timeutil "github.com/iwind/TeaGo/utils/time"
 	"math"
+	"math/rand"
 	"runtime"
 	"testing"
 	"time"
 )
 
 func TestList_Add(t *testing.T) {
-	list := NewList()
+	var list = expires.NewList()
 	list.Add(1, time.Now().Unix())
 	t.Log("===BEFORE===")
-	logs.PrintAsJSON(list.expireMap, t)
-	logs.PrintAsJSON(list.itemsMap, t)
+	logs.PrintAsJSON(list.ExpireMap(), t)
+	logs.PrintAsJSON(list.ItemsMap(), t)
 
 	list.Add(1, time.Now().Unix()+1)
 	list.Add(2, time.Now().Unix()+1)
 	list.Add(3, time.Now().Unix()+2)
 	t.Log("===AFTER===")
-	logs.PrintAsJSON(list.expireMap, t)
-	logs.PrintAsJSON(list.itemsMap, t)
+	logs.PrintAsJSON(list.ExpireMap(), t)
+	logs.PrintAsJSON(list.ItemsMap(), t)
 }
 
 func TestList_Add_Overwrite(t *testing.T) {
 	var timestamp = time.Now().Unix()
 
-	list := NewList()
+	var list = expires.NewList()
 	list.Add(1, timestamp+1)
 	list.Add(1, timestamp+1)
 	list.Add(1, timestamp+2)
-	logs.PrintAsJSON(list.expireMap, t)
-	logs.PrintAsJSON(list.itemsMap, t)
+	logs.PrintAsJSON(list.ExpireMap(), t)
+	logs.PrintAsJSON(list.ItemsMap(), t)
 
 	var a = assert.NewAssertion(t)
-	a.IsTrue(len(list.itemsMap) == 1)
-	a.IsTrue(len(list.expireMap) == 1)
-	a.IsTrue(list.itemsMap[1] == timestamp+2)
+	a.IsTrue(len(list.ItemsMap()) == 1)
+	a.IsTrue(len(list.ExpireMap()) == 1)
+	a.IsTrue(list.ItemsMap()[1] == timestamp+2)
 }
 
 func TestList_Remove(t *testing.T) {
-	list := NewList()
+	var list = expires.NewList()
 	list.Add(1, time.Now().Unix()+1)
 	list.Remove(1)
-	logs.PrintAsJSON(list.expireMap, t)
-	logs.PrintAsJSON(list.itemsMap, t)
+	logs.PrintAsJSON(list.ExpireMap(), t)
+	logs.PrintAsJSON(list.ItemsMap(), t)
 }
 
 func TestList_GC(t *testing.T) {
 	var unixTime = time.Now().Unix()
 	t.Log("unixTime:", unixTime)
 
-	var list = NewList()
+	var list = expires.NewList()
 	list.Add(1, unixTime+1)
 	list.Add(2, unixTime+1)
 	list.Add(3, unixTime+2)
 	list.OnGC(func(itemId uint64) {
 		t.Log("gc:", itemId)
 	})
-	t.Log("last unixTime:", list.lastTimestamp)
+	t.Log("last unixTime:", list.LastTimestamp())
 	list.GC(time.Now().Unix() + 2)
-	logs.PrintAsJSON(list.expireMap, t)
-	logs.PrintAsJSON(list.itemsMap, t)
+	logs.PrintAsJSON(list.ExpireMap(), t)
+	logs.PrintAsJSON(list.ItemsMap(), t)
 
 	t.Log(list.Count())
 }
 
 func TestList_GC_Batch(t *testing.T) {
-	list := NewList()
+	var list = expires.NewList()
 	list.Add(1, time.Now().Unix()+1)
 	list.Add(2, time.Now().Unix()+1)
 	list.Add(3, time.Now().Unix()+2)
 	list.Add(4, time.Now().Unix()+2)
-	list.OnGCBatch(func(itemMap ItemMap) {
+	list.OnGCBatch(func(itemMap expires.ItemMap) {
 		t.Log("gc:", itemMap)
 	})
 	list.GC(time.Now().Unix() + 2)
-	logs.PrintAsJSON(list.expireMap, t)
-	logs.PrintAsJSON(list.itemsMap, t)
+	logs.PrintAsJSON(list.ExpireMap(), t)
+	logs.PrintAsJSON(list.ItemsMap(), t)
 }
 
 func TestList_Start_GC(t *testing.T) {
@@ -89,7 +91,7 @@ func TestList_Start_GC(t *testing.T) {
 		return
 	}
 
-	list := NewList()
+	var list = expires.NewList()
 	list.Add(1, time.Now().Unix()+1)
 	list.Add(2, time.Now().Unix()+1)
 	list.Add(3, time.Now().Unix()+2)
@@ -105,14 +107,14 @@ func TestList_Start_GC(t *testing.T) {
 	})
 
 	go func() {
-		SharedManager.Add(list)
+		expires.SharedManager.Add(list)
 	}()
 
 	time.Sleep(20 * time.Second)
 }
 
 func TestList_ManyItems(t *testing.T) {
-	list := NewList()
+	var list = expires.NewList()
 	for i := 0; i < 1_000; i++ {
 		list.Add(uint64(i), time.Now().Unix())
 	}
@@ -135,13 +137,12 @@ func TestList_Memory(t *testing.T) {
 		return
 	}
 
-	var list = NewList()
+	var list = expires.NewList()
 
 	testutils.StartMemoryStats(t, func() {
 		t.Log(list.Count(), "items")
 	})
 
-
 	for i := 0; i < 10_000_000; i++ {
 		list.Add(uint64(i), time.Now().Unix()+1800)
 	}
@@ -194,6 +195,15 @@ func TestList_Map_Performance(t *testing.T) {
 	}
 }
 
+func BenchmarkList_Add(b *testing.B) {
+	var list = expires.NewList()
+	b.RunParallel(func(pb *testing.PB) {
+		for pb.Next() {
+			list.Add(rand.Uint64(), fasttime.Now().Unix()+int64(rand.Int()%10_000_000))
+		}
+	})
+}
+
 func Benchmark_Map_Uint64(b *testing.B) {
 	runtime.GOMAXPROCS(1)
 	var timestamp = uint64(time.Now().Unix())
@@ -214,14 +224,14 @@ func Benchmark_Map_Uint64(b *testing.B) {
 }
 
 func BenchmarkList_GC(b *testing.B) {
-	runtime.GOMAXPROCS(1)
+	runtime.GOMAXPROCS(4)
 
-	var lists = []*List{}
+	var lists = []*expires.List{}
 
 	for m := 0; m < 1_000; m++ {
-		var list = NewList()
+		var list = expires.NewList()
 		for j := 0; j < 10_000; j++ {
-			list.Add(uint64(j), fasttime.Now().Unix()+100)
+			list.Add(uint64(j), fasttime.Now().Unix()+int64(rand.Int()%1_000_000))
 		}
 		lists = append(lists, list)
 	}
@@ -233,7 +243,7 @@ func BenchmarkList_GC(b *testing.B) {
 	b.RunParallel(func(pb *testing.PB) {
 		for pb.Next() {
 			for _, list := range lists {
-				list.GC(timestamp)
+				list.GC(timestamp + int64(rand.Int()%1_000_000))
 			}
 		}
 	})