Apply review

Co-authored-by: lightclient <lightclient@protonmail.com>
This commit is contained in:
Daniel Knopik 2024-07-30 12:12:32 +02:00
parent 7508f4d5d2
commit 9ade71a1df
No known key found for this signature in database
GPG key ID: C56F35A74383E739

View file

@ -77,12 +77,18 @@ func (tr *tableRevalidation) nodeEndpointChanged(tab *Table, n *tableNode) {
// It returns the next time it should be invoked, which is used in the Table main loop // It returns the next time it should be invoked, which is used in the Table main loop
// to schedule a timer. However, run can be called at any time. // to schedule a timer. However, run can be called at any time.
func (tr *tableRevalidation) run(tab *Table, now mclock.AbsTime) (nextTime mclock.AbsTime) { func (tr *tableRevalidation) run(tab *Table, now mclock.AbsTime) (nextTime mclock.AbsTime) {
if n := tr.fast.getAndSchedule(now, &tab.rand, tr.activeReq); n != nil { reval := func(list *revalidationList) {
tr.startRequest(tab, n) if list.nextTime <= now {
} if n := list.get(now, &tab.rand, tr.activeReq); n != nil {
if n := tr.slow.getAndSchedule(now, &tab.rand, tr.activeReq); n != nil { tr.startRequest(tab, n)
tr.startRequest(tab, n) }
// Update nextTime regardless if any requests were started because
// current value has passed.
list.schedule(now, &tab.rand)
}
} }
reval(&tr.fast)
reval(&tr.slow)
return min(tr.fast.nextTime, tr.slow.nextTime) return min(tr.fast.nextTime, tr.slow.nextTime)
} }
@ -196,13 +202,8 @@ type revalidationList struct {
name string name string
} }
// getAndSchedule returns a random node from the queue. Nodes in the 'exclude' map are not returned. // get returns a random node from the queue. Nodes in the 'exclude' map are not returned.
// It also schedules the next invocation if nextTime has already passed. func (list *revalidationList) get(now mclock.AbsTime, rand randomSource, exclude map[enode.ID]struct{}) *tableNode {
func (list *revalidationList) getAndSchedule(now mclock.AbsTime, rand randomSource, exclude map[enode.ID]struct{}) *tableNode {
if now < list.nextTime {
return nil
}
list.schedule(now, rand)
if len(list.nodes) == 0 { if len(list.nodes) == 0 {
return nil return nil
} }