refactor: releaseWorkerPools()

Author: ARR4N

core/state/trie_prefetcher.go

@@ -79,7 +79,6 @@ func newTriePrefetcher(db Database, root common.Hash, namespace string, opts ...
 // close iterates over all the subfetchers, aborts any that were left spinning
 // and reports the stats to the metrics subsystem.
 func (p *triePrefetcher) close() {
-	p.abortFetchersAndReleaseWorkerPools()
 	for _, fetcher := range p.fetchers {
 		fetcher.abort() // safe to do multiple times
 
@@ -105,6 +104,7 @@ func (p *triePrefetcher) close() {
 			}
 		}
 	}
+	p.releaseWorkerPools()
 	// Clear out all fetchers (will crash on a second call, deliberate)
 	p.fetchers = nil
 }

core/state/trie_prefetcher.libevm.go

@@ -71,22 +71,11 @@ func (c *prefetcherConfig) applyTo(sf *subfetcher) {
 	}
 }
 
-func (p *triePrefetcher) abortFetchersAndReleaseWorkerPools() {
-	// Calling abort() sequentially may result in later fetchers accepting new
-	// work in the interim.
-	var wg sync.WaitGroup
-	for _, f := range p.fetchers {
-		wg.Add(1)
-		go func(f *subfetcher) {
-			f.abort()
-			wg.Done()
-		}(f)
-	}
-
-	// A WorkerPool is allowed to be shared between fetchers so we MUST wait for
-	// them to finish all tasks otherwise they could call Execute() after
-	// Done(), which we guarantee in the public API to be impossible.
-	wg.Wait()
+// releaseWorkerPools calls Done() on all [WorkerPool]s. This MUST only be
+// called after [subfetcher.abort] returns on ALL fetchers as a pool is allowed
+// to be shared between them. This is because we guarantee in the public API
+// that no further calls will be made to Execute() after a call to Done().
+func (p *triePrefetcher) releaseWorkerPools() {
 	for _, f := range p.fetchers {
 		if w := f.pool.workers; w != nil {
 			w.Done()