forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-02-26 15:47:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

discover: replace created locks by table lock on run function

Browse source
This commit is contained in:
Rafael Sampaio 2025-04-07 20:01:34 -03:00
parent a04615cbab
commit 8628080475
1 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
p2p/discover/table_reval.go
View file

@ -20,7 +20,6 @@ import (
"fmt"
"math"
"slices"
"sync"
"time"
"github.com/ethereum/go-ethereum/common/mclock"
@ -79,29 +78,20 @@ func (tr *tableRevalidation) nodeEndpointChanged(tab *Table, n *tableNode) {
// to schedule a timer. However, run can be called at any time.
func (tr *tableRevalidation) run(tab *Table, now mclock.AbsTime) (nextTime mclock.AbsTime) {
reval := func(list *revalidationList) {
// nextTime locked for reading, unlock in the end of function or before schedule to prevent deadlock
list.ntLock.RLock()
if list.nextTime <= now {
if n := list.get(&tab.rand, tr.activeReq); n != nil {
tr.startRequest(tab, n)
}
// Update nextTime regardless if any requests were started because
// current value has passed.
// unlock before schedule to prevent deadlock with write lock, return to prevent double unlock
list.ntLock.RUnlock()
tab.mutex.Lock()
list.schedule(now, &tab.rand)
return
tab.mutex.Unlock()
}
// in case of false if verification, unlock nextTime
list.ntLock.RUnlock()
}
reval(&tr.fast)
reval(&tr.slow)
tr.fast.ntLock.RLock()
tr.slow.ntLock.RLock()
defer tr.fast.ntLock.RUnlock()
defer tr.slow.ntLock.RUnlock()
return min(tr.fast.nextTime, tr.slow.nextTime)
}
@ -210,7 +200,6 @@ func (tr *tableRevalidation) moveToList(dest *revalidationList, n *tableNode, no
type revalidationList struct {
nodes []*tableNode
nextTime mclock.AbsTime
ntLock sync.RWMutex
interval time.Duration
name string
}
@ -231,8 +220,6 @@ func (list *revalidationList) get(rand randomSource, exclude map[enode.ID]struct
}
func (list *revalidationList) schedule(now mclock.AbsTime, rand randomSource) {
list.ntLock.Lock()
defer list.ntLock.Unlock()
list.nextTime = now.Add(time.Duration(rand.Int63n(int64(list.interval))))
}
@ -251,8 +238,6 @@ func (list *revalidationList) remove(n *tableNode) {
}
list.nodes = slices.Delete(list.nodes, i, i+1)
if len(list.nodes) == 0 {
list.ntLock.Lock()
defer list.ntLock.Unlock()
list.nextTime = never
}
n.revalList = nil