Refactor(pool): move to internal (#398)

xjasonlyu · Aug 31, 2024 · fc4c5c4 · fc4c5c4
1 parent 978803c
commit fc4c5c4
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 27 deletions.
diff --git a/common/pool/buffer.go b/common/pool/buffer.go
diff --git a/common/pool/alloc.go → internal/pool/alloc.go b/common/pool/alloc.go → internal/pool/alloc.go
@@ -51,8 +51,7 @@ func (alloc *Allocator) Put(buf []byte) error {
 		return errors.New("allocator Put() incorrect buffer size")
 	}
 
-	//lint:ignore SA6002 ignore temporarily
-	//nolint
+	//nolint:staticcheck
 	alloc.buffers[b].Put(buf)
 	return nil
 }

diff --git a/common/pool/alloc_test.go → internal/pool/alloc_test.go b/common/pool/alloc_test.go → internal/pool/alloc_test.go
diff --git a/internal/pool/buffer.go b/internal/pool/buffer.go
@@ -0,0 +1,17 @@
+package pool
+
+import (
+	"bytes"
+	"sync"
+)
+
+var _bufferPool = sync.Pool{New: func() any { return &bytes.Buffer{} }}
+
+func GetBuffer() *bytes.Buffer {
+	return _bufferPool.Get().(*bytes.Buffer)
+}
+
+func PutBuffer(buf *bytes.Buffer) {
+	buf.Reset()
+	_bufferPool.Put(buf)
+}
diff --git a/common/pool/pool.go → internal/pool/pool.go b/common/pool/pool.go → internal/pool/pool.go
diff --git a/proxy/relay.go b/proxy/relay.go
@@ -13,8 +13,8 @@ import (
 
 	"github.com/go-gost/relay"
 
-	"github.com/xjasonlyu/tun2socks/v2/common/pool"
 	"github.com/xjasonlyu/tun2socks/v2/dialer"
+	"github.com/xjasonlyu/tun2socks/v2/internal/pool"
 	M "github.com/xjasonlyu/tun2socks/v2/metadata"
 	"github.com/xjasonlyu/tun2socks/v2/proxy/proto"
 )

diff --git a/transport/shadowsocks/shadowaead/packet.go b/transport/shadowsocks/shadowaead/packet.go
@@ -6,7 +6,7 @@ import (
 	"io"
 	"net"
 
-	"github.com/xjasonlyu/tun2socks/v2/common/pool"
+	"github.com/xjasonlyu/tun2socks/v2/internal/pool"
 )
 
 // ErrShortPacket means that the packet is too short for a valid encrypted packet.

diff --git a/transport/shadowsocks/shadowaead/stream.go b/transport/shadowsocks/shadowaead/stream.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"net"
 
-	"github.com/xjasonlyu/tun2socks/v2/common/pool"
+	"github.com/xjasonlyu/tun2socks/v2/internal/pool"
 )
 
 const (

diff --git a/transport/shadowsocks/shadowstream/packet.go b/transport/shadowsocks/shadowstream/packet.go
@@ -6,7 +6,7 @@ import (
 	"io"
 	"net"
 
-	"github.com/xjasonlyu/tun2socks/v2/common/pool"
+	"github.com/xjasonlyu/tun2socks/v2/internal/pool"
 )
 
 // ErrShortPacket means the packet is too short to be a valid encrypted packet.

diff --git a/transport/simple-obfs/http.go b/transport/simple-obfs/http.go
@@ -10,7 +10,7 @@ import (
 	"net"
 	"net/http"
 
-	"github.com/xjasonlyu/tun2socks/v2/common/pool"
+	"github.com/xjasonlyu/tun2socks/v2/internal/pool"
 )
 
 // HTTPObfs is shadowsocks http simple-obfs implementation

diff --git a/transport/simple-obfs/tls.go b/transport/simple-obfs/tls.go
@@ -8,7 +8,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/xjasonlyu/tun2socks/v2/common/pool"
+	"github.com/xjasonlyu/tun2socks/v2/internal/pool"
 )
 
 const (

diff --git a/tunnel/tcp.go b/tunnel/tcp.go
@@ -7,8 +7,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/xjasonlyu/tun2socks/v2/common/pool"
 	"github.com/xjasonlyu/tun2socks/v2/core/adapter"
+	"github.com/xjasonlyu/tun2socks/v2/internal/pool"
 	"github.com/xjasonlyu/tun2socks/v2/log"
 	M "github.com/xjasonlyu/tun2socks/v2/metadata"
 	"github.com/xjasonlyu/tun2socks/v2/tunnel/statistic"

diff --git a/tunnel/udp.go b/tunnel/udp.go
@@ -6,8 +6,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/xjasonlyu/tun2socks/v2/common/pool"
 	"github.com/xjasonlyu/tun2socks/v2/core/adapter"
+	"github.com/xjasonlyu/tun2socks/v2/internal/pool"
 	"github.com/xjasonlyu/tun2socks/v2/log"
 	M "github.com/xjasonlyu/tun2socks/v2/metadata"
 	"github.com/xjasonlyu/tun2socks/v2/tunnel/statistic"