优化代码

internal/caches/list_file_db_sqlite.go

@@ -7,9 +7,9 @@ import (
 	"fmt"
 	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
-	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"github.com/TeaOSLab/EdgeNode/internal/utils/dbs"
 	"github.com/TeaOSLab/EdgeNode/internal/utils/fasttime"
+	memutils "github.com/TeaOSLab/EdgeNode/internal/utils/mem"
 	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/types"
 	"net"
@@ -64,7 +64,7 @@ func (this *SQLiteFileListDB) Open(dbPath string) error {
 
 	// 动态调整Cache值
 	var cacheSize = 512
-	var memoryGB = utils.SystemMemoryGB()
+	var memoryGB = memutils.SystemMemoryGB()
 	if memoryGB >= 1 {
 		cacheSize = 256 * memoryGB
 	}

internal/caches/list_file_hash_map_sqlite.go

@@ -3,7 +3,7 @@
 package caches
 
 import (
-	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	memutils "github.com/TeaOSLab/EdgeNode/internal/utils/mem"
 	"github.com/TeaOSLab/EdgeNode/internal/zero"
 	"math/big"
 	"sync"
@@ -46,7 +46,7 @@ func NewSQLiteFileListHashMap() *SQLiteFileListHashMap {
 
 func (this *SQLiteFileListHashMap) Load(db *SQLiteFileListDB) error {
 	// 如果系统内存过小，我们不缓存
-	if utils.SystemMemoryGB() < 3 {
+	if memutils.SystemMemoryGB() < 3 {
 		return nil
 	}
 

internal/caches/manager.go

@@ -7,7 +7,7 @@ import (
 	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
 	"github.com/TeaOSLab/EdgeNode/internal/events"
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
-	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	memutils "github.com/TeaOSLab/EdgeNode/internal/utils/mem"
 	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/types"
 	"golang.org/x/sys/unix"
@@ -299,7 +299,7 @@ func (this *Manager) MaxSystemMemoryBytesPerStorage() int64 {
 		count = 1
 	}
 
-	var resultBytes = int64(utils.SystemMemoryBytes()) / 3 / int64(count) // 1/3 of the system memory
+	var resultBytes = int64(memutils.SystemMemoryBytes()) / 3 / int64(count) // 1/3 of the system memory
 	if resultBytes < 1<<30 {
 		resultBytes = 1 << 30
 	}

internal/caches/memory_fragment_pool.go

@@ -5,8 +5,8 @@ package caches
 import (
 	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
 	"github.com/TeaOSLab/EdgeNode/internal/goman"
-	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"github.com/TeaOSLab/EdgeNode/internal/utils/fasttime"
+	memutils "github.com/TeaOSLab/EdgeNode/internal/utils/mem"
 	"github.com/iwind/TeaGo/logs"
 	"os"
 	"sync"
@@ -93,7 +93,7 @@ func NewMemoryFragmentPool() *MemoryFragmentPool {
 }
 
 func (this *MemoryFragmentPool) init() {
-	var capacity = int64(utils.SystemMemoryGB()) << 30 / 16
+	var capacity = int64(memutils.SystemMemoryGB()) << 30 / 16
 	if capacity > 256<<20 {
 		this.isOk = true
 		this.capacity = capacity

internal/caches/open_file_cache.go

@@ -5,8 +5,8 @@ package caches
 import (
 	"fmt"
 	"github.com/TeaOSLab/EdgeNode/internal/goman"
-	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"github.com/TeaOSLab/EdgeNode/internal/utils/linkedlist"
+	memutils "github.com/TeaOSLab/EdgeNode/internal/utils/mem"
 	"github.com/fsnotify/fsnotify"
 	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/types"
@@ -43,7 +43,7 @@ func NewOpenFileCache(maxCount int) (*OpenFileCache, error) {
 		maxCount:     maxCount,
 		poolMap:      map[string]*OpenFilePool{},
 		poolList:     linkedlist.NewList[*OpenFilePool](),
-		capacitySize: (int64(utils.SystemMemoryGB()) << 30) / 16,
+		capacitySize: (int64(memutils.SystemMemoryGB()) << 30) / 16,
 	}
 
 	watcher, err := fsnotify.NewWatcher()

internal/caches/storage_memory.go

@@ -9,6 +9,7 @@ import (
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"github.com/TeaOSLab/EdgeNode/internal/utils/fasttime"
 	fsutils "github.com/TeaOSLab/EdgeNode/internal/utils/fs"
+	memutils "github.com/TeaOSLab/EdgeNode/internal/utils/mem"
 	setutils "github.com/TeaOSLab/EdgeNode/internal/utils/sets"
 	"github.com/TeaOSLab/EdgeNode/internal/zero"
 	"github.com/cespare/xxhash"
@@ -66,7 +67,7 @@ func NewMemoryStorage(policy *serverconfigs.HTTPCachePolicy, parentStorage Stora
 
 	if parentStorage != nil {
 		if queueSize <= 0 {
-			queueSize = utils.SystemMemoryGB() * 100_000
+			queueSize = memutils.SystemMemoryGB() * 100_000
 		}
 
 		dirtyChan = make(chan string, queueSize)

internal/compressions/reader_pool_brotli.go

@@ -4,7 +4,7 @@ package compressions
 
 import (
 	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
-	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	memutils "github.com/TeaOSLab/EdgeNode/internal/utils/mem"
 	"io"
 )
 
@@ -15,7 +15,7 @@ func init() {
 		return
 	}
 
-	var maxSize = utils.SystemMemoryGB() * 256
+	var maxSize = memutils.SystemMemoryGB() * 256
 	if maxSize == 0 {
 		maxSize = 256
 	}

internal/compressions/reader_pool_deflate.go

@@ -4,7 +4,7 @@ package compressions
 
 import (
 	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
-	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	memutils "github.com/TeaOSLab/EdgeNode/internal/utils/mem"
 	"io"
 )
 
@@ -15,7 +15,7 @@ func init() {
 		return
 	}
 
-	var maxSize = utils.SystemMemoryGB() * 256
+	var maxSize = memutils.SystemMemoryGB() * 256
 	if maxSize == 0 {
 		maxSize = 256
 	}

internal/compressions/reader_pool_gzip.go

@@ -4,7 +4,7 @@ package compressions
 
 import (
 	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
-	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	memutils "github.com/TeaOSLab/EdgeNode/internal/utils/mem"
 	"io"
 )
 
@@ -15,7 +15,7 @@ func init() {
 		return
 	}
 
-	var maxSize = utils.SystemMemoryGB() * 256
+	var maxSize = memutils.SystemMemoryGB() * 256
 	if maxSize == 0 {
 		maxSize = 256
 	}

internal/compressions/reader_pool_zstd.go

@@ -4,7 +4,7 @@ package compressions
 
 import (
 	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
-	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	memutils "github.com/TeaOSLab/EdgeNode/internal/utils/mem"
 	"io"
 )
 
@@ -15,7 +15,7 @@ func init() {
 		return
 	}
 
-	var maxSize = utils.SystemMemoryGB() * 256
+	var maxSize = memutils.SystemMemoryGB() * 256
 	if maxSize == 0 {
 		maxSize = 256
 	}

internal/compressions/writer_pool_brotli.go

@@ -4,7 +4,7 @@ package compressions
 
 import (
 	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
-	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	memutils "github.com/TeaOSLab/EdgeNode/internal/utils/mem"
 	"github.com/andybalholm/brotli"
 	"io"
 )
@@ -16,7 +16,7 @@ func init() {
 		return
 	}
 
-	var maxSize = utils.SystemMemoryGB() * 256
+	var maxSize = memutils.SystemMemoryGB() * 256
 	if maxSize == 0 {
 		maxSize = 256
 	}

internal/compressions/writer_pool_deflate.go

@@ -5,7 +5,7 @@ package compressions
 import (
 	"compress/flate"
 	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
-	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	memutils "github.com/TeaOSLab/EdgeNode/internal/utils/mem"
 	"io"
 )
 
@@ -16,7 +16,7 @@ func init() {
 		return
 	}
 
-	var maxSize = utils.SystemMemoryGB() * 256
+	var maxSize = memutils.SystemMemoryGB() * 256
 	if maxSize == 0 {
 		maxSize = 256
 	}

internal/compressions/writer_pool_gzip.go

@@ -5,7 +5,7 @@ package compressions
 import (
 	"compress/gzip"
 	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
-	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	memutils "github.com/TeaOSLab/EdgeNode/internal/utils/mem"
 	"io"
 )
 
@@ -16,7 +16,7 @@ func init() {
 		return
 	}
 
-	var maxSize = utils.SystemMemoryGB() * 256
+	var maxSize = memutils.SystemMemoryGB() * 256
 	if maxSize == 0 {
 		maxSize = 256
 	}

internal/compressions/writer_pool_zstd.go

@@ -4,7 +4,7 @@ package compressions
 
 import (
 	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
-	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	memutils "github.com/TeaOSLab/EdgeNode/internal/utils/mem"
 	"github.com/klauspost/compress/zstd"
 	"io"
 )
@@ -16,7 +16,7 @@ func init() {
 		return
 	}
 
-	var maxSize = utils.SystemMemoryGB() * 256
+	var maxSize = memutils.SystemMemoryGB() * 256
 	if maxSize == 0 {
 		maxSize = 256
 	}

internal/nodes/http_access_log_queue.go

@@ -7,6 +7,7 @@ import (
 	"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
 	"github.com/TeaOSLab/EdgeNode/internal/rpc"
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	memutils "github.com/TeaOSLab/EdgeNode/internal/utils/mem"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"strings"
@@ -26,7 +27,7 @@ type HTTPAccessLogQueue struct {
 // NewHTTPAccessLogQueue 获取新对象
 func NewHTTPAccessLogQueue() *HTTPAccessLogQueue {
 	// 队列中最大的值，超出此数量的访问日志会被丢弃
-	var maxSize = 2_000 * (1 + utils.SystemMemoryGB()/2)
+	var maxSize = 2_000 * (1 + memutils.SystemMemoryGB()/2)
 	if maxSize > 20_000 {
 		maxSize = 20_000
 	}

internal/nodes/node.go

@@ -29,6 +29,7 @@ import (
 	_ "github.com/TeaOSLab/EdgeNode/internal/utils/agents" // 引入Agent管理器
 	_ "github.com/TeaOSLab/EdgeNode/internal/utils/clock"  // 触发时钟更新
 	"github.com/TeaOSLab/EdgeNode/internal/utils/jsonutils"
+	memutils "github.com/TeaOSLab/EdgeNode/internal/utils/mem"
 	"github.com/TeaOSLab/EdgeNode/internal/waf"
 	"github.com/andybalholm/brotli"
 	"github.com/iwind/TeaGo/Tea"
@@ -1123,7 +1124,7 @@ func (this *Node) tuneSystemParameters() {
 	}
 
 	// vm
-	var systemMemory = utils.SystemMemoryGB()
+	var systemMemory = memutils.SystemMemoryGB()
 	if systemMemory >= 128 {
 		systemParameters = append(systemParameters, []variable{
 			{name: "vm.dirty_background_ratio", minValue: 40},

internal/stats/user_agent_parser.go

@@ -4,8 +4,8 @@ package stats
 
 import (
 	"github.com/TeaOSLab/EdgeNode/internal/goman"
-	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"github.com/TeaOSLab/EdgeNode/internal/utils/fnv"
+	memutils "github.com/TeaOSLab/EdgeNode/internal/utils/mem"
 	syncutils "github.com/TeaOSLab/EdgeNode/internal/utils/sync"
 	"github.com/mssola/useragent"
 	"sync"
@@ -50,7 +50,7 @@ func NewUserAgentParser() *UserAgentParser {
 // 初始化
 func (this *UserAgentParser) init() {
 	var maxCacheItems = 10_000
-	var systemMemory = utils.SystemMemoryGB()
+	var systemMemory = memutils.SystemMemoryGB()
 	if systemMemory >= 16 {
 		maxCacheItems = 40_000
 	} else if systemMemory >= 8 {

internal/ttlcache/cache.go

@@ -1,8 +1,8 @@
 package ttlcache
 
 import (
-	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"github.com/TeaOSLab/EdgeNode/internal/utils/fasttime"
+	memutils "github.com/TeaOSLab/EdgeNode/internal/utils/mem"
 	"runtime"
 )
 
@@ -25,7 +25,7 @@ type Cache[T any] struct {
 }
 
 func NewBigCache[T any]() *Cache[T] {
-	var delta = utils.SystemMemoryGB() / 2
+	var delta = memutils.SystemMemoryGB() / 2
 	if delta <= 0 {
 		delta = 1
 	}
@@ -36,7 +36,7 @@ func NewCache[T any](opt ...OptionInterface) *Cache[T] {
 	var countPieces = 256
 	var maxItems = 1_000_000
 
-	var totalMemory = utils.SystemMemoryGB()
+	var totalMemory = memutils.SystemMemoryGB()
 	if totalMemory < 2 {
 		// 我们限制内存过小的服务能够使用的数量
 		maxItems = 500_000

internal/ttlcache/cache_test.go

@@ -1,8 +1,8 @@
 package ttlcache
 
 import (
-	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"github.com/TeaOSLab/EdgeNode/internal/utils/fasttime"
+	memutils "github.com/TeaOSLab/EdgeNode/internal/utils/mem"
 	"github.com/TeaOSLab/EdgeNode/internal/utils/testutils"
 	"github.com/iwind/TeaGo/assert"
 	"github.com/iwind/TeaGo/rands"
@@ -60,7 +60,7 @@ func TestCache_Memory(t *testing.T) {
 	})
 
 	var count = 1_000_000
-	if utils.SystemMemoryGB() > 4 {
+	if memutils.SystemMemoryGB() > 4 {
 		count = 20_000_000
 	}
 	for i := 0; i < count; i++ {

internal/utils/byte_pool.go

@@ -4,10 +4,10 @@ import (
 	"sync"
 )
 
-var BytePool1k = NewBytePool(1024)
-var BytePool4k = NewBytePool(4 * 1024)
-var BytePool16k = NewBytePool(16 * 1024)
-var BytePool32k = NewBytePool(32 * 1024)
+var BytePool1k = NewBytePool(1 << 10)
+var BytePool4k = NewBytePool(4 << 10)
+var BytePool16k = NewBytePool(16 << 10)
+var BytePool32k = NewBytePool(32 << 10)
 
 // BytePool pool for get byte slice
 type BytePool struct {

internal/utils/cachehits/stat.go

@@ -4,8 +4,8 @@ package cachehits
 
 import (
 	"github.com/TeaOSLab/EdgeNode/internal/goman"
-	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"github.com/TeaOSLab/EdgeNode/internal/utils/fasttime"
+	memutils "github.com/TeaOSLab/EdgeNode/internal/utils/mem"
 	"github.com/iwind/TeaGo/Tea"
 	"sync"
 	"sync/atomic"
@@ -38,7 +38,7 @@ func NewStat(goodRatio uint64) *Stat {
 		goodRatio = 5
 	}
 
-	var maxItems = utils.SystemMemoryGB() * 10_000
+	var maxItems = memutils.SystemMemoryGB() * 10_000
 	if maxItems <= 0 {
 		maxItems = 100_000
 	}

internal/utils/counters/counter.go

@@ -3,8 +3,8 @@
 package counters
 
 import (
-	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"github.com/TeaOSLab/EdgeNode/internal/utils/fasttime"
+	memutils "github.com/TeaOSLab/EdgeNode/internal/utils/mem"
 	syncutils "github.com/TeaOSLab/EdgeNode/internal/utils/sync"
 	"github.com/cespare/xxhash"
 	"sync"
@@ -31,7 +31,7 @@ type Counter[T SupportedUIntType] struct {
 
 // NewCounter create new counter
 func NewCounter[T SupportedUIntType]() *Counter[T] {
-	var count = utils.SystemMemoryGB() * 8
+	var count = memutils.SystemMemoryGB() * 8
 	if count < 8 {
 		count = 8
 	}

internal/utils/kvstore/store.go

@@ -6,7 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/TeaOSLab/EdgeNode/internal/events"
-	"github.com/TeaOSLab/EdgeNode/internal/utils"
+	memutils "github.com/TeaOSLab/EdgeNode/internal/utils/mem"
 	"github.com/cockroachdb/pebble"
 	"github.com/iwind/TeaGo/Tea"
 	"io"
@@ -90,7 +90,7 @@ func (this *Store) Open() error {
 		Logger: NewLogger(),
 	}
 
-	var memoryMB = utils.SystemMemoryGB() * 1
+	var memoryMB = memutils.SystemMemoryGB() * 1
 	if memoryMB > 256 {
 		memoryMB = 256
 	}

internal/utils/mem/system.go

@@ -1,6 +1,6 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
 
-package utils
+package memutils
 
 import (
 	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"

internal/utils/mem/system_1.19.go

@@ -1,7 +1,7 @@
 // Copyright 2023 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
 //go:build go1.19
 
-package utils
+package memutils
 
 import (
 	"runtime/debug"

internal/utils/mem/system_before_1.19.go

@@ -1,7 +1,7 @@
 // Copyright 2023 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
 //go:build !go1.19
 
-package utils
+package memutils
 
 // 设置软内存最大值
 func setMaxMemory(memoryGB int) {

internal/utils/system_test.go

@@ -1,14 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package utils
-
-import "testing"
-
-func TestSystemMemoryGB(t *testing.T) {
-	t.Log(SystemMemoryGB())
-	t.Log(SystemMemoryGB())
-	t.Log(SystemMemoryGB())
-	t.Log(SystemMemoryBytes())
-	t.Log(SystemMemoryBytes())
-	t.Log(SystemMemoryBytes()>>30, "GB")
-}