From 807217dd484cb551bdfbf3b158f47545a057d9cc Mon Sep 17 00:00:00 2001 From: devopsbo3 <69951731+devopsbo3@users.noreply.github.com> Date: Fri, 10 Nov 2023 12:27:53 -0600 Subject: [PATCH] Revert "cmd/devp2p: atomic types used (#27755)" This reverts commit f1fe86f5e3e2b7e3477f25fb37c9bbf83b6bfd64. --- cmd/devp2p/crawl.go | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/cmd/devp2p/crawl.go b/cmd/devp2p/crawl.go index 8c0defff6d..1b964164d8 100644 --- a/cmd/devp2p/crawl.go +++ b/cmd/devp2p/crawl.go @@ -87,11 +87,11 @@ func (c *crawler) run(timeout time.Duration, nthreads int) nodeSet { go c.runIterator(doneCh, it) } var ( - added atomic.Uint64 - updated atomic.Uint64 - skipped atomic.Uint64 - recent atomic.Uint64 - removed atomic.Uint64 + added uint64 + updated uint64 + skipped uint64 + recent uint64 + removed uint64 wg sync.WaitGroup ) wg.Add(nthreads) @@ -103,15 +103,15 @@ func (c *crawler) run(timeout time.Duration, nthreads int) nodeSet { case n := <-c.ch: switch c.updateNode(n) { case nodeSkipIncompat: - skipped.Add(1) + atomic.AddUint64(&skipped, 1) case nodeSkipRecent: - recent.Add(1) + atomic.AddUint64(&recent, 1) case nodeRemoved: - removed.Add(1) + atomic.AddUint64(&removed, 1) case nodeAdded: - added.Add(1) + atomic.AddUint64(&added, 1) default: - updated.Add(1) + atomic.AddUint64(&updated, 1) } case <-c.closed: return @@ -138,11 +138,11 @@ loop: break loop case <-statusTicker.C: log.Info("Crawling in progress", - "added", added.Load(), - "updated", updated.Load(), - "removed", removed.Load(), - "ignored(recent)", recent.Load(), - "ignored(incompatible)", skipped.Load()) + "added", atomic.LoadUint64(&added), + "updated", atomic.LoadUint64(&updated), + "removed", atomic.LoadUint64(&removed), + "ignored(recent)", atomic.LoadUint64(&recent), + "ignored(incompatible)", atomic.LoadUint64(&skipped)) } }