Revert "cmd/devp2p: atomic types used (#27755)"

This reverts commit f1fe86f5e3.
This commit is contained in:
devopsbo3 2023-11-10 12:27:53 -06:00 committed by GitHub
parent 37f173183c
commit 807217dd48

View file

@ -87,11 +87,11 @@ func (c *crawler) run(timeout time.Duration, nthreads int) nodeSet {
go c.runIterator(doneCh, it) go c.runIterator(doneCh, it)
} }
var ( var (
added atomic.Uint64 added uint64
updated atomic.Uint64 updated uint64
skipped atomic.Uint64 skipped uint64
recent atomic.Uint64 recent uint64
removed atomic.Uint64 removed uint64
wg sync.WaitGroup wg sync.WaitGroup
) )
wg.Add(nthreads) wg.Add(nthreads)
@ -103,15 +103,15 @@ func (c *crawler) run(timeout time.Duration, nthreads int) nodeSet {
case n := <-c.ch: case n := <-c.ch:
switch c.updateNode(n) { switch c.updateNode(n) {
case nodeSkipIncompat: case nodeSkipIncompat:
skipped.Add(1) atomic.AddUint64(&skipped, 1)
case nodeSkipRecent: case nodeSkipRecent:
recent.Add(1) atomic.AddUint64(&recent, 1)
case nodeRemoved: case nodeRemoved:
removed.Add(1) atomic.AddUint64(&removed, 1)
case nodeAdded: case nodeAdded:
added.Add(1) atomic.AddUint64(&added, 1)
default: default:
updated.Add(1) atomic.AddUint64(&updated, 1)
} }
case <-c.closed: case <-c.closed:
return return
@ -138,11 +138,11 @@ loop:
break loop break loop
case <-statusTicker.C: case <-statusTicker.C:
log.Info("Crawling in progress", log.Info("Crawling in progress",
"added", added.Load(), "added", atomic.LoadUint64(&added),
"updated", updated.Load(), "updated", atomic.LoadUint64(&updated),
"removed", removed.Load(), "removed", atomic.LoadUint64(&removed),
"ignored(recent)", recent.Load(), "ignored(recent)", atomic.LoadUint64(&recent),
"ignored(incompatible)", skipped.Load()) "ignored(incompatible)", atomic.LoadUint64(&skipped))
} }
} }