forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 09:23:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix queue.go

Browse source
This commit is contained in:
Tomás Andróil 2025-02-08 18:21:40 +01:00 committed by GitHub
parent 4cda8f06ea
commit 69307436ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
eth/downloader/queue.go
View file

@ -134,7 +134,7 @@ type queue struct {
headerPendPool map[string]*fetchRequest // Currently pending header retrieval operations headerPendPool map[string]*fetchRequest // Currently pending header retrieval operations
headerResults []*types.Header // Result cache accumulating the completed headers headerResults []*types.Header // Result cache accumulating the completed headers
headerHashes []common.Hash // Result cache accumulating the completed header hashes headerHashes []common.Hash // Result cache accumulating the completed header hashes
headerProced int // Number of headers already processed from the results headerProceed int // Number of headers already processed from the results
headerOffset uint64 // Number of the first header in the result cache headerOffset uint64 // Number of the first header in the result cache
headerContCh chan bool // Channel to notify when header download finishes headerContCh chan bool // Channel to notify when header download finishes
@ -276,7 +276,7 @@ func (q *queue) ScheduleSkeleton(from uint64, skeleton []*types.Header) {
q.headerPeerMiss = make(map[string]map[uint64]struct{}) // Reset availability to correct invalid chains q.headerPeerMiss = make(map[string]map[uint64]struct{}) // Reset availability to correct invalid chains
q.headerResults = make([]*types.Header, len(skeleton)*MaxHeaderFetch) q.headerResults = make([]*types.Header, len(skeleton)*MaxHeaderFetch)
q.headerHashes = make([]common.Hash, len(skeleton)*MaxHeaderFetch) q.headerHashes = make([]common.Hash, len(skeleton)*MaxHeaderFetch)
q.headerProced = 0 q.headerProceed = 0
q.headerOffset = from q.headerOffset = from
q.headerContCh = make(chan bool, 1) q.headerContCh = make(chan bool, 1)
@ -294,10 +294,10 @@ func (q *queue) RetrieveHeaders() ([]*types.Header, []common.Hash, int) {
q.lock.Lock() q.lock.Lock()
defer q.lock.Unlock() defer q.lock.Unlock()
headers, hashes, proced := q.headerResults, q.headerHashes, q.headerProced headers, hashes, proceed := q.headerResults, q.headerHashes, q.headerProceed
q.headerResults, q.headerHashes, q.headerProced = nil, nil, 0 q.headerResults, q.headerHashes, q.headerProceed = nil, nil, 0
return headers, hashes, proced return headers, hashes, proceed
} }
// Schedule adds a set of headers for the download queue for scheduling, returning // Schedule adds a set of headers for the download queue for scheduling, returning
@ -752,16 +752,16 @@ func (q *queue) DeliverHeaders(id string, headers []*types.Header, hashes []comm
delete(q.headerTaskPool, request.From) delete(q.headerTaskPool, request.From)
ready := 0 ready := 0
for q.headerProced+ready < len(q.headerResults) && q.headerResults[q.headerProced+ready] != nil { for q.headerProceed+ready < len(q.headerResults) && q.headerResults[q.headerProceed+ready] != nil {
ready += MaxHeaderFetch ready += MaxHeaderFetch
} }
if ready > 0 { if ready > 0 {
// Headers are ready for delivery, gather them and push forward (non blocking) // Headers are ready for delivery, gather them and push forward (non blocking)
processHeaders := make([]*types.Header, ready) processHeaders := make([]*types.Header, ready)
copy(processHeaders, q.headerResults[q.headerProced:q.headerProced+ready]) copy(processHeaders, q.headerResults[q.headerProceed:q.headerProceed+ready])
processHashes := make([]common.Hash, ready) processHashes := make([]common.Hash, ready)
copy(processHashes, q.headerHashes[q.headerProced:q.headerProced+ready]) copy(processHashes, q.headerHashes[q.headerProceed:q.headerProceed+ready])
select { select {
case headerProcCh <- &headerTask{ case headerProcCh <- &headerTask{
@ -769,7 +769,7 @@ func (q *queue) DeliverHeaders(id string, headers []*types.Header, hashes []comm
hashes: processHashes, hashes: processHashes,
}: }:
logger.Trace("Pre-scheduled new headers", "count", len(processHeaders), "from", processHeaders[0].Number) logger.Trace("Pre-scheduled new headers", "count", len(processHeaders), "from", processHeaders[0].Number)
q.headerProced += len(processHeaders) q.headerProceed += len(processHeaders)
default: default:
} }
} }