From a0c6649960bb4b1155181915d898d066af00a8cb Mon Sep 17 00:00:00 2001 From: Zsolt Felfoldi Date: Fri, 11 Nov 2016 18:26:34 +0100 Subject: [PATCH] les/flowcontrol: fixed locking scheme --- les/flowcontrol/control.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/les/flowcontrol/control.go b/les/flowcontrol/control.go index 0b8d7f58f5..acb131ea4f 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