From 16be33fc96cd27f73b2be9054d31e3771845cb22 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Mon, 19 Jun 2023 10:41:16 +0200 Subject: [PATCH 1/2] Change Add to TryAdd --- commonspace/object/tree/synctree/treesyncprotocol.go | 1 + net/streampool/stream.go | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/commonspace/object/tree/synctree/treesyncprotocol.go b/commonspace/object/tree/synctree/treesyncprotocol.go index be759259..d27d4e15 100644 --- a/commonspace/object/tree/synctree/treesyncprotocol.go +++ b/commonspace/object/tree/synctree/treesyncprotocol.go @@ -2,6 +2,7 @@ package synctree import ( "context" + "github.com/anyproto/any-sync/app/logger" "github.com/anyproto/any-sync/commonspace/object/tree/objecttree" "github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto" diff --git a/net/streampool/stream.go b/net/streampool/stream.go index 1d59af4b..ad75f24c 100644 --- a/net/streampool/stream.go +++ b/net/streampool/stream.go @@ -2,11 +2,12 @@ package streampool import ( "context" + "sync/atomic" + "github.com/anyproto/any-sync/app/logger" "github.com/cheggaaa/mb/v3" "go.uber.org/zap" "storj.io/drpc" - "sync/atomic" ) type stream struct { @@ -22,7 +23,7 @@ type stream struct { } func (sr *stream) write(msg drpc.Message) (err error) { - return sr.queue.Add(sr.stream.Context(), msg) + return sr.queue.TryAdd(sr.stream.Context(), msg) } func (sr *stream) readLoop() error { From a9889a6245630e0a8876bec416c26c8fe0edf85a Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Mon, 19 Jun 2023 11:10:56 +0200 Subject: [PATCH 2/2] TryAdd correctly --- net/streampool/stream.go | 2 +- net/streampool/streampool_test.go | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/net/streampool/stream.go b/net/streampool/stream.go index ad75f24c..2c4c959b 100644 --- a/net/streampool/stream.go +++ b/net/streampool/stream.go @@ -23,7 +23,7 @@ type stream struct { } func (sr *stream) write(msg drpc.Message) (err error) { - return sr.queue.TryAdd(sr.stream.Context(), msg) + return sr.queue.TryAdd(msg) } func (sr *stream) readLoop() error { diff --git a/net/streampool/streampool_test.go b/net/streampool/streampool_test.go index d4a05de3..30575019 100644 --- a/net/streampool/streampool_test.go +++ b/net/streampool/streampool_test.go @@ -2,18 +2,19 @@ package streampool import ( "fmt" + "sort" + "sync" + "sync/atomic" + "testing" + "time" + "github.com/anyproto/any-sync/net/peer" "github.com/anyproto/any-sync/net/rpc/rpctest" "github.com/anyproto/any-sync/net/streampool/testservice" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/net/context" - "sort" "storj.io/drpc" - "sync" - "sync/atomic" - "testing" - "time" ) var ctx = context.Background()