diff options
| author | Zsolt Felfoldi <zsfelfoldi@gmail.com> | 2016-11-12 01:26:34 +0800 |
|---|---|---|
| committer | Zsolt Felfoldi <zsfelfoldi@gmail.com> | 2016-11-14 20:22:19 +0800 |
| commit | a0c6649960bb4b1155181915d898d066af00a8cb (patch) | |
| tree | 9dee24b8de1a6e24dd4e8a49589476710c854835 | |
| parent | ca73dea3b9bcdf3b5424b5c48c70817439e2e304 (diff) | |
| download | go-tangerine-a0c6649960bb4b1155181915d898d066af00a8cb.tar.gz go-tangerine-a0c6649960bb4b1155181915d898d066af00a8cb.tar.zst go-tangerine-a0c6649960bb4b1155181915d898d066af00a8cb.zip | |
les/flowcontrol: fixed locking scheme
| -rw-r--r-- | les/flowcontrol/control.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/les/flowcontrol/control.go b/les/flowcontrol/control.go index 0b8d7f58f..acb131ea4 100644 --- a/les/flowcontrol/control.go +++ b/les/flowcontrol/control.go @@ -99,7 +99,7 @@ type ServerNode struct { params *ServerParams sumCost uint64 // sum of req costs sent to this server pending map[uint64]uint64 // value = sumCost after sending the given req - lock sync.Mutex + lock sync.RWMutex } func NewServerNode(params *ServerParams) *ServerNode { @@ -135,8 +135,8 @@ func (peer *ServerNode) canSend(maxCost uint64) uint64 { } func (peer *ServerNode) CanSend(maxCost uint64) uint64 { - peer.lock.Lock() - defer peer.lock.Unlock() + peer.lock.RLock() + defer peer.lock.RUnlock() return peer.canSend(maxCost) } @@ -148,7 +148,10 @@ func (peer *ServerNode) SendRequest(reqID, maxCost uint64) { peer.recalcBLE(getTime()) for peer.bufEstimate < maxCost { - time.Sleep(time.Duration(peer.canSend(maxCost))) + wait := time.Duration(peer.canSend(maxCost)) + peer.lock.Unlock() + time.Sleep(wait) + peer.lock.Lock() peer.recalcBLE(getTime()) } peer.bufEstimate -= maxCost |