From 93bed24a0b9f2ebf756e1774b0b9e20d2d8adf99 Mon Sep 17 00:00:00 2001 From: 9seconds Date: Fri, 3 Dec 2021 07:39:45 +0300 Subject: [PATCH] Remove all cleverness that broke uploads --- essentials/conns.go | 2 - mtglib/internal/relay/init.go | 6 +-- mtglib/internal/relay/pools.go | 30 ++++------- mtglib/internal/relay/relay.go | 36 +++++++------- mtglib/internal/relay/relay_test.go | 2 - mtglib/internal/relay/sync_pair.go | 77 ----------------------------- 6 files changed, 27 insertions(+), 126 deletions(-) delete mode 100644 mtglib/internal/relay/sync_pair.go diff --git a/essentials/conns.go b/essentials/conns.go index 432591a..1b3cbf0 100644 --- a/essentials/conns.go +++ b/essentials/conns.go @@ -8,14 +8,12 @@ import ( // CloseableReader is a reader interface that can close its reading end. type CloseableReader interface { io.Reader - CloseRead() error } // CloseableWriter is a writer that can close its writing end. type CloseableWriter interface { io.Writer - CloseWrite() error } diff --git a/mtglib/internal/relay/init.go b/mtglib/internal/relay/init.go index 6278c48..a0dcb0c 100644 --- a/mtglib/internal/relay/init.go +++ b/mtglib/internal/relay/init.go @@ -1,11 +1,7 @@ package relay -import "time" - const ( - copyBufferSize = 64 * 1024 - writerBufferSize = 128 * 1024 - readTimeout = 10 * time.Millisecond + copyBufferSize = 64 * 1024 ) type Logger interface { diff --git a/mtglib/internal/relay/pools.go b/mtglib/internal/relay/pools.go index 2adff99..7b9371e 100644 --- a/mtglib/internal/relay/pools.go +++ b/mtglib/internal/relay/pools.go @@ -1,31 +1,19 @@ package relay -import ( - "bufio" - "io" - "net" - "sync" -) +import "sync" -var syncPairPool = sync.Pool{ +var copyBufferPool = sync.Pool{ New: func() interface{} { - return &syncPair{ - writer: bufio.NewWriterSize(nil, writerBufferSize), - copyBuf: make([]byte, copyBufferSize), - } + rv := make([]byte, copyBufferSize) + + return &rv }, } -func acquireSyncPair(reader net.Conn, writer io.Writer) *syncPair { - sp := syncPairPool.Get().(*syncPair) // nolint: forcetypeassert - sp.writer.Reset(writer) - sp.reader = reader - - return sp +func acquireCopyBuffer() *[]byte { + return copyBufferPool.Get().(*[]byte) } -func releaseSyncPair(sp *syncPair) { - sp.writer.Reset(nil) - sp.reader = nil - syncPairPool.Put(sp) +func releaseCopyBuffer(buf *[]byte) { + copyBufferPool.Put(buf) } diff --git a/mtglib/internal/relay/relay.go b/mtglib/internal/relay/relay.go index 6f9db4f..0350373 100644 --- a/mtglib/internal/relay/relay.go +++ b/mtglib/internal/relay/relay.go @@ -4,7 +4,6 @@ import ( "context" "errors" "io" - "sync" "github.com/9seconds/mtg/v2/essentials" ) @@ -22,28 +21,27 @@ func Relay(ctx context.Context, log Logger, telegramConn, clientConn essentials. clientConn.Close() }() - wg := &sync.WaitGroup{} - wg.Add(2) // nolint: gomnd + closeChan := make(chan struct{}) - go pump(log, telegramConn, clientConn, wg, "client -> telegram") + go func() { + defer close(closeChan) - pump(log, clientConn, telegramConn, wg, "telegram -> client") - - wg.Wait() -} - -func pump(log Logger, src, dst essentials.Conn, wg *sync.WaitGroup, direction string) { - syncer := acquireSyncPair(src, dst) - - defer func() { - syncer.Flush() - releaseSyncPair(syncer) - src.CloseRead() // nolint: errcheck - dst.CloseWrite() // nolint: errcheck - wg.Done() + pump(log, telegramConn, clientConn, "client -> telegram") }() - n, err := syncer.Sync() + pump(log, clientConn, telegramConn, "telegram -> client") + + <-closeChan +} + +func pump(log Logger, src, dst essentials.Conn, direction string) { + defer src.CloseRead() // nolint: errcheck + defer dst.CloseWrite() // nolint: errcheck + + copyBuffer := acquireCopyBuffer() + defer releaseCopyBuffer(copyBuffer) + + n, err := io.CopyBuffer(src, dst, *copyBuffer) switch { case err == nil: diff --git a/mtglib/internal/relay/relay_test.go b/mtglib/internal/relay/relay_test.go index 368469f..390af9d 100644 --- a/mtglib/internal/relay/relay_test.go +++ b/mtglib/internal/relay/relay_test.go @@ -42,14 +42,12 @@ func (suite *RelayTestSuite) TestExit() { suite.telegramConnMock.On("CloseWrite").Return(nil).Once() suite.telegramConnMock.On("Read", mock.Anything).Return(10, io.EOF).Once() suite.telegramConnMock.On("Write", mock.Anything).Return(10, io.EOF).Maybe() - suite.telegramConnMock.On("SetReadDeadline", mock.Anything).Return(nil).Maybe() suite.clientConnMock.On("Read", mock.Anything).Return(0, io.EOF).Once() suite.clientConnMock.On("Write", mock.Anything).Return(10, io.EOF).Maybe() suite.clientConnMock.On("Close").Return(nil) suite.clientConnMock.On("CloseRead").Return(nil).Once() suite.clientConnMock.On("CloseWrite").Return(nil).Once() - suite.clientConnMock.On("SetReadDeadline", mock.Anything).Return(nil).Maybe() relay.Relay(suite.ctx, suite.loggerMock, suite.telegramConnMock, suite.clientConnMock) } diff --git a/mtglib/internal/relay/sync_pair.go b/mtglib/internal/relay/sync_pair.go deleted file mode 100644 index 035b05e..0000000 --- a/mtglib/internal/relay/sync_pair.go +++ /dev/null @@ -1,77 +0,0 @@ -package relay - -import ( - "bufio" - "errors" - "fmt" - "io" - "net" - "os" - "sync" - "time" -) - -type syncPair struct { - writer *bufio.Writer - copyBuf []byte - - mutex sync.Mutex - reader net.Conn -} - -func (s *syncPair) Sync() (int64, error) { - return io.CopyBuffer(s, s, s.copyBuf) // nolint: wrapcheck -} - -func (s *syncPair) Read(p []byte) (int, error) { - n, err := s.readBlocking(p, false) - - // nothing has been delivered for readTimeout time. Let's flush. - if errors.Is(err, os.ErrDeadlineExceeded) { - if err := s.Flush(); err != nil { - return 0, fmt.Errorf("cannot flush writer hand-side: %w", err) - } - - return s.readBlocking(p, true) - } - - return n, err -} - -func (s *syncPair) Write(p []byte) (int, error) { - s.mutex.Lock() - defer s.mutex.Unlock() - - n, err := s.writer.Write(p) - - // optimization for a case when we have a small package and want to avoid a - // delay in readTimeout. In that case, we assume that peer has finished to - // sent a data it wants to send so we can flush without waiting for anything - // else. - if err == nil && n < copyBufferSize { - err = s.writer.Flush() - } - - return n, err // nolint: wrapcheck -} - -func (s *syncPair) Flush() error { - s.mutex.Lock() - defer s.mutex.Unlock() - - return s.writer.Flush() // nolint: wrapcheck -} - -func (s *syncPair) readBlocking(p []byte, blocking bool) (int, error) { - var deadline time.Time - - if !blocking { - deadline = time.Now().Add(readTimeout) - } - - if err := s.reader.SetReadDeadline(deadline); err != nil { - return 0, fmt.Errorf("cannot set read deadline: %w", err) - } - - return s.reader.Read(p) // nolint: wrapcheck -}