forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

les: protect field access with lock to avoid possible data race

Browse source
This commit is contained in:
BurtonQin 2020-02-19 18:39:02 +08:00
parent 96490a10be
commit e228f66e21
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
les/client_handler.go
View file

@ -125,7 +125,10 @@ func (h *clientHandler) handle(p *peer) error {
serverConnectionGauge.Update(int64(h.backend.peers.Len())) serverConnectionGauge.Update(int64(h.backend.peers.Len()))
}() }()
h.fetcher.announce(p, p.headInfo) p.lock.RLock()
headInfo := p.headInfo
p.lock.RUnlock()
h.fetcher.announce(p, headInfo)
// pool entry can be nil during the unit test. // pool entry can be nil during the unit test.
if p.poolEntry != nil { if p.poolEntry != nil {

7
les/clientpool.go
View file

@ -481,7 +481,10 @@ func (f *clientPool) setCapacity(c *clientInfo, capacity uint64) error {
f.connectedCap += capacity - oldCapacity f.connectedCap += capacity - oldCapacity
c.balanceTracker.setCapacity(capacity) c.balanceTracker.setCapacity(capacity)
f.connectedQueue.Update(c.queueIndex) f.connectedQueue.Update(c.queueIndex)
if f.connectedCap > f.capLimit { f.lock.Lock()
capLimit := f.capLimit
f.lock.Unlock()
if f.connectedCap > capLimit {
var kickList []*clientInfo var kickList []*clientInfo
kick := true kick := true
f.connectedQueue.MultiPop(func(data interface{}, priority int64) bool { f.connectedQueue.MultiPop(func(data interface{}, priority int64) bool {
@ -491,7 +494,7 @@ func (f *clientPool) setCapacity(c *clientInfo, capacity uint64) error {
if client == c { if client == c {
kick = false kick = false
} }
return kick && (f.connectedCap > f.capLimit) return kick && (f.connectedCap > capLimit)
}) })
if kick { if kick {
now := mclock.Now() now := mclock.Now()