Skip to content

G
Geth-Modification
Commit a0c66499 authored by Zsolt Felfoldi's avatar Zsolt Felfoldi
Browse files
Options

les/flowcontrol: fixed locking scheme

parent ca73dea3
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
les/flowcontrol/control.go
View file @ a0c66499
...@@ -99,7 +99,7 @@ type ServerNode struct { ...@@ -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 { ...@@ -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) { ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment