fix: remove streamPool to avoid memory leak

gopcua · May 20, 2024 · 08a5726 · 08a5726
1 parent fd36b8c
commit 08a5726
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 29 deletions.
diff --git a/ua/encode.go b/ua/encode.go
@@ -8,29 +8,12 @@ import (
 	"fmt"
 	"math"
 	"reflect"
-	"sync"
 	"time"
 
 	"github.com/gopcua/opcua/debug"
 	"github.com/gopcua/opcua/errors"
 )
 
-var streamPool sync.Pool = sync.Pool{
-	New: func() interface{} {
-		return NewStream(DefaultBufSize)
-	},
-}
-
-func BorrowStream() *Stream {
-	v := streamPool.Get().(*Stream)
-	v.Reset()
-	return v
-}
-
-func ReturnStream(s *Stream) {
-	streamPool.Put(s)
-}
-
 // debugCodec enables printing of debug messages in the opcua codec.
 var debugCodec = debug.FlagSet("codec")
 

diff --git a/ua/extension_object.go b/ua/extension_object.go
@@ -94,8 +94,7 @@ func (e *ExtensionObject) Encode(s *Stream) {
 		return
 	}
 
-	body := BorrowStream()
-	defer ReturnStream(body)
+	body := NewStream(DefaultBufSize)
 	body.WriteAny(e.Value)
 	if body.Error() != nil {
 		s.WrapError(body.Error())

diff --git a/ua/stream.go b/ua/stream.go
@@ -38,6 +38,7 @@ func (s *Stream) Len() int {
 func (s *Stream) Reset() {
 	s.buf = s.buf[:0]
 	s.pos = 0
+	s.err = nil
 }
 
 func (s *Stream) Bytes() []byte {

diff --git a/uacp/conn.go b/uacp/conn.go
@@ -396,8 +396,7 @@ func (c *Conn) Send(typ string, msg interface{}) error {
 		return errors.Errorf("invalid msg type: %s", typ)
 	}
 
-	bodyStream := ua.BorrowStream()
-	defer ua.ReturnStream(bodyStream)
+	bodyStream := ua.NewStream(ua.DefaultBufSize)
 	bodyStream.WriteAny(msg)
 	if bodyStream.Error() != nil {
 		return errors.Errorf("encode msg failed: %s", bodyStream.Error())
@@ -413,8 +412,7 @@ func (c *Conn) Send(typ string, msg interface{}) error {
 		return errors.Errorf("send packet too large: %d > %d bytes", h.MessageSize, c.ack.SendBufSize)
 	}
 
-	headerStream := ua.BorrowStream()
-	defer ua.ReturnStream(headerStream)
+	headerStream := ua.NewStream(ua.DefaultBufSize)
 	h.Encode(headerStream)
 	if headerStream.Error() != nil {
 		return errors.Errorf("encode hdr failed: %s", headerStream.Error())

diff --git a/uasc/codec_test.go b/uasc/codec_test.go
@@ -54,8 +54,7 @@ func RunCodecTest(t *testing.T, cases []CodecTestCase) {
 			})
 
 			t.Run("encode", func(t *testing.T) {
-				s := ua.BorrowStream()
-				defer ua.ReturnStream(s)
+				s := ua.NewStream(ua.DefaultBufSize)
 				s.WriteAny(c.Struct)
 				if s.Error() != nil {
 					t.Fatal(s.Error())

diff --git a/uasc/message.go b/uasc/message.go
@@ -119,8 +119,7 @@ func (m *Message) Encode(s *ua.Stream) {
 }
 
 func (m *Message) EncodeChunks(maxBodySize uint32) ([][]byte, error) {
-	dataBody := ua.BorrowStream()
-	defer ua.ReturnStream(dataBody)
+	dataBody := ua.NewStream(ua.DefaultBufSize)
 	dataBody.WriteAny(m.TypeID)
 	dataBody.WriteAny(m.Service)
 	if dataBody.Error() != nil {
@@ -132,8 +131,7 @@ func (m *Message) EncodeChunks(maxBodySize uint32) ([][]byte, error) {
 
 	switch m.Header.MessageType {
 	case "OPN":
-		partialHeader := ua.BorrowStream()
-		defer ua.ReturnStream(dataBody)
+		partialHeader := ua.NewStream(ua.DefaultBufSize)
 		partialHeader.WriteAny(m.AsymmetricSecurityHeader)
 		partialHeader.WriteAny(m.SequenceHeader)
 		if partialHeader.Error() != nil {