transport: remove ReleaseBuf, use pool directly

IrineSistiana · Nov 6, 2023 · b16a871 · b16a871
1 parent 5db7455
commit b16a871
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/pkg/upstream/transport/conn_traditional.go b/pkg/upstream/transport/conn_traditional.go
@@ -179,10 +179,10 @@ func (dc *TraditionalDnsConn) readLoop() {
 			select {
 			case resChan <- r: // resChan has buffer
 			default:
-				ReleaseResp(r)
+				pool.ReleaseBuf(r)
 			}
 		} else {
-			ReleaseResp(r)
+			pool.ReleaseBuf(r)
 		}
 	}
 }

diff --git a/pkg/upstream/transport/reuse.go b/pkg/upstream/transport/reuse.go
@@ -27,6 +27,7 @@ import (
 	"time"
 
 	"github.com/IrineSistiana/mosdns/v5/pkg/dnsutils"
+	"github.com/IrineSistiana/mosdns/v5/pkg/pool"
 	"go.uber.org/zap"
 )
 
@@ -262,7 +263,7 @@ func (c *reusableConn) readLoop() {
 		c.m.Unlock()
 
 		if respChan == nil {
-			ReleaseResp(resp)
+			pool.ReleaseBuf(resp)
 			c.closeWithErr(errUnexpectedResp)
 			return
 		}

diff --git a/pkg/upstream/transport/transport.go b/pkg/upstream/transport/transport.go
@@ -24,8 +24,6 @@ import (
 	"errors"
 	"io"
 	"time"
-
-	"github.com/IrineSistiana/mosdns/v5/pkg/pool"
 )
 
 var (
@@ -35,10 +33,6 @@ var (
 	ErrLazyConnCannotReserveQueryExchanger = errors.New("lazy connection failed to reserve query exchanger")
 )
 
-func ReleaseResp(b *[]byte) {
-	pool.ReleaseBuf(b)
-}
-
 const (
 	defaultIdleTimeout = time.Second * 10
 	defaultDialTimeout = time.Second * 5

diff --git a/pkg/upstream/upstream.go b/pkg/upstream/upstream.go
@@ -34,6 +34,7 @@ import (
 	"time"
 
 	"github.com/IrineSistiana/mosdns/v5/mlog"
+	"github.com/IrineSistiana/mosdns/v5/pkg/pool"
 	"github.com/IrineSistiana/mosdns/v5/pkg/upstream/bootstrap"
 	"github.com/IrineSistiana/mosdns/v5/pkg/upstream/doh"
 	"github.com/IrineSistiana/mosdns/v5/pkg/upstream/transport"
@@ -567,7 +568,7 @@ func (u *udpWithFallback) ExchangeContext(ctx context.Context, q []byte) (*[]byt
 		return nil, err
 	}
 	if msgTruncated(*r) {
-		transport.ReleaseResp(r)
+		pool.ReleaseBuf(r)
 		return u.t.ExchangeContext(ctx, q)
 	}
 	return r, nil