From f8716d990e232e72fb9b743e593bf3ab3815a070 Mon Sep 17 00:00:00 2001
From: yusing <yusing.wys@gmail.com>
Date: Sat, 18 Oct 2025 17:38:01 +0800
Subject: [PATCH] perf(pool): split bytes pool into tiered sized and unsized
 pools

- Remove BytesPoolWithMemory; split into UnsizedBytesPool and 11-tier SizedBytesPool
- Track buffer capacities with xsync Map to prevent capacity leaks
- Improve buffer reuse: split large buffers and put remainders back in pool
- Optimize small buffers to use unsized pool
- Expand test coverage and benchmarks for various allocation sizes
---
 goutils                                       |  2 +-
 internal/api/v1/metrics/all_system_info.go    | 48 ++++++-------------
 internal/api/v1/metrics/system_info.go        | 14 ++++--
 internal/homepage/list_icons.go               | 24 +++++-----
 internal/logging/accesslog/access_logger.go   | 10 ++--
 internal/logging/accesslog/rotate.go          |  7 +--
 internal/net/gphttp/middleware/modify_html.go |  4 +-
 internal/route/rules/response_modifier.go     | 25 +++++-----
 internal/route/stream/udp_udp.go              |  2 +-
 9 files changed, 60 insertions(+), 76 deletions(-)

diff --git a/goutils b/goutils
index 425d3686..d2503244 160000
--- a/goutils
+++ b/goutils
@@ -1 +1 @@
-Subproject commit 425d3686419597ef5e1060f4083b12763a1ce14e
+Subproject commit d25032447f197215b1af39e36f63151cf938b20b
diff --git a/internal/api/v1/metrics/all_system_info.go b/internal/api/v1/metrics/all_system_info.go
index 1a75da1d..2d1bf011 100644
--- a/internal/api/v1/metrics/all_system_info.go
+++ b/internal/api/v1/metrics/all_system_info.go
@@ -1,10 +1,8 @@
 package metrics
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
-	"io"
 	"net/http"
 	"sync"
 	"sync/atomic"
@@ -18,17 +16,13 @@ import (
 	"github.com/yusing/godoxy/internal/metrics/period"
 	"github.com/yusing/godoxy/internal/metrics/systeminfo"
 	gperr "github.com/yusing/goutils/errs"
+	httputils "github.com/yusing/goutils/http"
 	"github.com/yusing/goutils/http/httpheaders"
 	"github.com/yusing/goutils/http/websocket"
 	"github.com/yusing/goutils/synk"
 )
 
-var (
-	// for json marshaling (unknown size)
-	allSystemInfoBytesPool = synk.GetBytesPoolWithUniqueMemory()
-	// for storing http response body (known size)
-	allSystemInfoFixedSizePool = synk.GetBytesPool()
-)
+var bytesPool = synk.GetUnsizedBytesPool()
 
 type AllSystemInfoRequest struct {
 	Period    period.Filter                      `query:"period"`
@@ -38,6 +32,7 @@ type AllSystemInfoRequest struct {
 
 type bytesFromPool struct {
 	json.RawMessage
+	release func([]byte)
 }
 
 // @x-id				"all_system_info"
@@ -183,38 +178,26 @@ func AllSystemInfo(c *gin.Context) {
 	}
 }
 
-func getAgentSystemInfo(ctx context.Context, a *agent.AgentConfig, query string) (json.Marshaler, error) {
+func getAgentSystemInfo(ctx context.Context, a *agent.AgentConfig, query string) (bytesFromPool, error) {
 	ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
 	defer cancel()
 
 	path := agent.EndpointSystemInfo + "?" + query
 	resp, err := a.Do(ctx, http.MethodGet, path, nil)
 	if err != nil {
-		return nil, err
+		return bytesFromPool{}, err
 	}
 	defer resp.Body.Close()
 
 	// NOTE: buffer will be released by marshalSystemInfo once marshaling is done.
-	if resp.ContentLength >= 0 {
-		bytesBuf := allSystemInfoFixedSizePool.GetSized(int(resp.ContentLength))
-		_, err = io.ReadFull(resp.Body, bytesBuf)
-		if err != nil {
-			// prevent pool leak on error.
-			allSystemInfoFixedSizePool.Put(bytesBuf)
-			return nil, err
-		}
-		return bytesFromPool{json.RawMessage(bytesBuf)}, nil
-	}
-
-	// Fallback when content length is unknown (should not happen but just in case).
-	data, err := io.ReadAll(resp.Body)
+	bytesBuf, release, err := httputils.ReadAllBody(resp)
 	if err != nil {
-		return nil, err
+		return bytesFromPool{}, err
 	}
-	return json.RawMessage(data), nil
+	return bytesFromPool{json.RawMessage(bytesBuf), release}, nil
 }
 
-func getAgentSystemInfoWithRetry(ctx context.Context, a *agent.AgentConfig, query string) (json.Marshaler, error) {
+func getAgentSystemInfoWithRetry(ctx context.Context, a *agent.AgentConfig, query string) (bytesFromPool, error) {
 	const maxRetries = 3
 	var lastErr error
 
@@ -224,7 +207,7 @@ func getAgentSystemInfoWithRetry(ctx context.Context, a *agent.AgentConfig, quer
 			delay := max((1<<attempt)*time.Second, 5*time.Second)
 			select {
 			case <-ctx.Done():
-				return nil, ctx.Err()
+				return bytesFromPool{}, ctx.Err()
 			case <-time.After(delay):
 			}
 		}
@@ -240,23 +223,22 @@ func getAgentSystemInfoWithRetry(ctx context.Context, a *agent.AgentConfig, quer
 
 		// Don't retry on context cancellation
 		if ctx.Err() != nil {
-			return nil, ctx.Err()
+			return bytesFromPool{}, ctx.Err()
 		}
 	}
 
-	return nil, lastErr
+	return bytesFromPool{}, lastErr
 }
 
 func marshalSystemInfo(ws *websocket.Manager, agentName string, systemInfo any) error {
-	bytesBuf := allSystemInfoBytesPool.Get()
-	defer allSystemInfoBytesPool.Put(bytesBuf)
+	buf := bytesPool.GetBuffer()
+	defer bytesPool.PutBuffer(buf)
 
 	// release the buffer retrieved from getAgentSystemInfo
 	if bufFromPool, ok := systemInfo.(bytesFromPool); ok {
-		defer allSystemInfoFixedSizePool.Put(bufFromPool.RawMessage)
+		defer bufFromPool.release(bufFromPool.RawMessage)
 	}
 
-	buf := bytes.NewBuffer(bytesBuf)
 	err := sonic.ConfigDefault.NewEncoder(buf).Encode(map[string]any{
 		agentName: systemInfo,
 	})
diff --git a/internal/api/v1/metrics/system_info.go b/internal/api/v1/metrics/system_info.go
index ed019d5e..bf98c933 100644
--- a/internal/api/v1/metrics/system_info.go
+++ b/internal/api/v1/metrics/system_info.go
@@ -70,12 +70,16 @@ func SystemInfo(c *gin.Context) {
 		maps.Copy(c.Writer.Header(), resp.Header)
 		c.Status(resp.StatusCode)
 
-		buf := pool.Get()
-		defer pool.Put(buf)
-		io.CopyBuffer(c.Writer, resp.Body, buf)
+		pool := synk.GetSizedBytesPool()
+		buf := pool.GetSized(16384)
+		_, err = io.CopyBuffer(c.Writer, resp.Body, buf)
+		pool.Put(buf)
+
+		if err != nil {
+			c.Error(apitypes.InternalServerError(err, "failed to copy response to client"))
+			return
+		}
 	} else {
 		agent.ReverseProxy(c.Writer, c.Request, agentPkg.EndpointSystemInfo)
 	}
 }
-
-var pool = synk.GetBytesPool()
diff --git a/internal/homepage/list_icons.go b/internal/homepage/list_icons.go
index a03d63ce..367fc2ae 100644
--- a/internal/homepage/list_icons.go
+++ b/internal/homepage/list_icons.go
@@ -3,7 +3,6 @@ package homepage
 import (
 	"context"
 	"fmt"
-	"io"
 	"net/http"
 	"slices"
 	"strings"
@@ -14,6 +13,7 @@ import (
 	"github.com/rs/zerolog/log"
 	"github.com/yusing/godoxy/internal/common"
 	"github.com/yusing/godoxy/internal/serialization"
+	httputils "github.com/yusing/goutils/http"
 	strutils "github.com/yusing/goutils/strings"
 	"github.com/yusing/goutils/synk"
 	"github.com/yusing/goutils/task"
@@ -266,30 +266,26 @@ func updateIcons(m IconMap) error {
 var httpGet = httpGetImpl
 
 func MockHTTPGet(body []byte) {
-	httpGet = func(_ string) ([]byte, error) {
-		return body, nil
+	httpGet = func(_ string) ([]byte, func([]byte), error) {
+		return body, func([]byte) {}, nil
 	}
 }
 
-func httpGetImpl(url string) ([]byte, error) {
+func httpGetImpl(url string) ([]byte, func([]byte), error) {
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 	defer resp.Body.Close()
 
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-	return body, nil
+	return httputils.ReadAllBody(resp)
 }
 
 /*
@@ -308,13 +304,14 @@ format:
 	}
 */
 func UpdateWalkxCodeIcons(m IconMap) error {
-	body, err := httpGet(walkxcodeIcons)
+	body, release, err := httpGet(walkxcodeIcons)
 	if err != nil {
 		return err
 	}
 
 	data := make(map[string][]string)
 	err = sonic.Unmarshal(body, &data)
+	release(body)
 	if err != nil {
 		return err
 	}
@@ -379,13 +376,14 @@ func UpdateSelfhstIcons(m IconMap) error {
 		Tags      string
 	}
 
-	body, err := httpGet(selfhstIcons)
+	body, release, err := httpGet(selfhstIcons)
 	if err != nil {
 		return err
 	}
 
 	data := make([]SelfhStIcon, 0)
 	err = sonic.Unmarshal(body, &data) //nolint:musttag
+	release(body)
 	if err != nil {
 		return err
 	}
diff --git a/internal/logging/accesslog/access_logger.go b/internal/logging/accesslog/access_logger.go
index 9cc4fcac..5c3af924 100644
--- a/internal/logging/accesslog/access_logger.go
+++ b/internal/logging/accesslog/access_logger.go
@@ -76,7 +76,7 @@ const (
 	errBurst     = 5
 )
 
-var lineBufPool = synk.GetBytesPoolWithUniqueMemory()
+var bytesPool = synk.GetUnsizedBytesPool()
 
 func NewAccessLogger(parent task.Parent, cfg AnyConfig) (*AccessLogger, error) {
 	io, err := cfg.IO()
@@ -156,13 +156,13 @@ func (l *AccessLogger) Log(req *http.Request, res *http.Response) {
 		return
 	}
 
-	line := lineBufPool.Get()
+	line := bytesPool.Get()
 	line = l.AppendRequestLog(line, req, res)
 	if line[len(line)-1] != '\n' {
 		line = append(line, '\n')
 	}
 	l.write(line)
-	lineBufPool.Put(line)
+	bytesPool.Put(line)
 }
 
 func (l *AccessLogger) LogError(req *http.Request, err error) {
@@ -170,13 +170,13 @@ func (l *AccessLogger) LogError(req *http.Request, err error) {
 }
 
 func (l *AccessLogger) LogACL(info *maxmind.IPInfo, blocked bool) {
-	line := lineBufPool.Get()
+	line := bytesPool.Get()
 	line = l.AppendACLLog(line, info, blocked)
 	if line[len(line)-1] != '\n' {
 		line = append(line, '\n')
 	}
 	l.write(line)
-	lineBufPool.Put(line)
+	bytesPool.Put(line)
 }
 
 func (l *AccessLogger) ShouldRotate() bool {
diff --git a/internal/logging/accesslog/rotate.go b/internal/logging/accesslog/rotate.go
index b53d33b7..e3dd4bb1 100644
--- a/internal/logging/accesslog/rotate.go
+++ b/internal/logging/accesslog/rotate.go
@@ -11,7 +11,6 @@ import (
 	"github.com/yusing/godoxy/internal/utils"
 	gperr "github.com/yusing/goutils/errs"
 	strutils "github.com/yusing/goutils/strings"
-	"github.com/yusing/goutils/synk"
 )
 
 type supportRotate interface {
@@ -59,8 +58,6 @@ type lineInfo struct {
 	Size int64 // Size of this line
 }
 
-var rotateBytePool = synk.GetBytesPoolWithUniqueMemory()
-
 // rotateLogFile rotates the log file based on the retention policy.
 // It writes to the result and returns an error if any.
 //
@@ -167,9 +164,9 @@ func rotateLogFileByPolicy(file supportRotate, config *Retention, result *Rotate
 
 	// Read each line and write it to the beginning of the file
 	writePos := int64(0)
-	buf := rotateBytePool.Get()
+	buf := bytesPool.Get()
 	defer func() {
-		rotateBytePool.Put(buf)
+		bytesPool.Put(buf)
 	}()
 
 	// in reverse order to keep the order of the lines (from old to new)
diff --git a/internal/net/gphttp/middleware/modify_html.go b/internal/net/gphttp/middleware/modify_html.go
index 96008798..d4866d1f 100644
--- a/internal/net/gphttp/middleware/modify_html.go
+++ b/internal/net/gphttp/middleware/modify_html.go
@@ -18,13 +18,13 @@ type modifyHTML struct {
 	Target    string // css selector
 	HTML      string // html to inject
 	Replace   bool   // replace the target element with the new html instead of appending it
-	bytesPool *synk.BytesPool
+	bytesPool synk.UnsizedBytesPool
 }
 
 var ModifyHTML = NewMiddleware[modifyHTML]()
 
 func (m *modifyHTML) setup() {
-	m.bytesPool = synk.GetBytesPool()
+	m.bytesPool = synk.GetUnsizedBytesPool()
 }
 
 func (m *modifyHTML) before(_ http.ResponseWriter, req *http.Request) bool {
diff --git a/internal/route/rules/response_modifier.go b/internal/route/rules/response_modifier.go
index 773615a7..2b01f077 100644
--- a/internal/route/rules/response_modifier.go
+++ b/internal/route/rules/response_modifier.go
@@ -13,7 +13,7 @@ import (
 )
 
 type ResponseModifier struct {
-	bufPool *synk.BytesPoolWithMemory
+	bufPool synk.UnsizedBytesPool
 
 	w          http.ResponseWriter
 	buf        *bytes.Buffer
@@ -68,12 +68,12 @@ func GetSharedData(w http.ResponseWriter) Cache {
 // It should only be called once, at the very beginning of the request.
 func NewResponseModifier(w http.ResponseWriter) *ResponseModifier {
 	return &ResponseModifier{
-		bufPool: synk.GetBytesPoolWithUniqueMemory(),
+		bufPool: synk.GetUnsizedBytesPool(),
 		w:       w,
 	}
 }
 
-func (rm *ResponseModifier) BufPool() *synk.BytesPoolWithMemory {
+func (rm *ResponseModifier) BufPool() synk.UnsizedBytesPool {
 	return rm.bufPool
 }
 
@@ -144,6 +144,15 @@ func (rm *ResponseModifier) Hijack() (net.Conn, *bufio.ReadWriter, error) {
 	return nil, nil, errors.New("hijack not supported")
 }
 
+func (rm *ResponseModifier) Flush() error {
+	if flusher, ok := rm.w.(http.Flusher); ok {
+		flusher.Flush()
+	} else if errFlusher, ok := rm.w.(interface{ Flush() error }); ok {
+		return errFlusher.Flush()
+	}
+	return nil
+}
+
 // FlushRelease flushes the response modifier and releases the resources
 // it returns the number of bytes written and the aggregated error
 // if there is any error (rule errors or write error), it will be returned
@@ -166,14 +175,8 @@ func (rm *ResponseModifier) FlushRelease() (int, error) {
 			if werr != nil {
 				rm.errs.Addf("write error: %w", werr)
 			}
-			// flush the response writer
-			if flusher, ok := rm.w.(http.Flusher); ok {
-				flusher.Flush()
-			} else if errFlusher, ok := rm.w.(interface{ Flush() error }); ok {
-				ferr := errFlusher.Flush()
-				if ferr != nil {
-					rm.errs.Addf("flush error: %w", ferr)
-				}
+			if err := rm.Flush(); err != nil {
+				rm.errs.Addf("flush error: %w", err)
 			}
 		}
 	}
diff --git a/internal/route/stream/udp_udp.go b/internal/route/stream/udp_udp.go
index 2d696dc7..20b813a9 100644
--- a/internal/route/stream/udp_udp.go
+++ b/internal/route/stream/udp_udp.go
@@ -49,7 +49,7 @@ const (
 	udpReadTimeout     = 30 * time.Second
 )
 
-var bufPool = synk.GetBytesPool()
+var bufPool = synk.GetSizedBytesPool()
 
 func NewUDPUDPStream(listenAddr, dstAddr string) (nettypes.Stream, error) {
 	dst, err := net.ResolveUDPAddr("udp", dstAddr)