roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

les/flowcontrol: fixed locking scheme

Browse Source
This commit is contained in:
Zsolt Felfoldi 2016-11-11 18:26:34 +01:00
parent ca73dea3b9
commit a0c6649960
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
les/flowcontrol/control.go
View File

@ -99,7 +99,7 @@ type ServerNode struct {
params *ServerParams params *ServerParams
sumCost uint64 // sum of req costs sent to this server sumCost uint64 // sum of req costs sent to this server
pending map[uint64]uint64 // value = sumCost after sending the given req pending map[uint64]uint64 // value = sumCost after sending the given req
lock sync.Mutex lock sync.RWMutex
} }
func NewServerNode(params *ServerParams) *ServerNode { func NewServerNode(params *ServerParams) *ServerNode {
@ -135,8 +135,8 @@ func (peer *ServerNode) canSend(maxCost uint64) uint64 {
} }
func (peer *ServerNode) CanSend(maxCost uint64) uint64 { func (peer *ServerNode) CanSend(maxCost uint64) uint64 {
peer.lock.Lock() peer.lock.RLock()
defer peer.lock.Unlock() defer peer.lock.RUnlock()
return peer.canSend(maxCost) return peer.canSend(maxCost)
} }
@ -148,7 +148,10 @@ func (peer *ServerNode) SendRequest(reqID, maxCost uint64) {
peer.recalcBLE(getTime()) peer.recalcBLE(getTime())
for peer.bufEstimate < maxCost { 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.recalcBLE(getTime())
} }
peer.bufEstimate -= maxCost peer.bufEstimate -= maxCost