forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 22:56:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

eth/downloader: keep track of all scheduled/completed body requests, use that (instead of the index of the first incomplete request) to determine the throttle threshold.

Browse source
This commit is contained in:
Jared Wasinger 2025-04-15 08:58:51 +08:00
parent 3ae9adfc1b
commit cca407b2a1
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
eth/downloader/resultstore.go
View file

@ -49,6 +49,9 @@ type resultStore struct {
// some current ones have completed. // some current ones have completed.
itemsGasUsed uint64 itemsGasUsed uint64
// count of all scheduled items (including completes that haven't yet been purged)
itemsCount int
lock sync.RWMutex lock sync.RWMutex
} }
@ -82,6 +85,7 @@ func (r *resultStore) AddFetch(header *types.Header, fastSync bool) (stale, thro
return false, true, nil, nil return false, true, nil, nil
} }
r.itemsGasUsed += header.GasUsed r.itemsGasUsed += header.GasUsed
r.itemsCount++
item = newFetchResult(header, fastSync) item = newFetchResult(header, fastSync)
r.items[index] = item r.items[index] = item
} }
@ -119,7 +123,7 @@ func (r *resultStore) isThrottled(index int) bool {
// retrievals that can be allowed until the cumulative block size hits a // retrievals that can be allowed until the cumulative block size hits a
// predetermined threshold (1 gb). // predetermined threshold (1 gb).
func (r *resultStore) throttleThreshold() int { func (r *resultStore) throttleThreshold() int {
index := r.indexIncomplete.Load() index := r.itemsCount - 1
avgGasUsed := r.itemsGasUsed / (uint64(index) + 1) avgGasUsed := r.itemsGasUsed / (uint64(index) + 1)
blockSize := max(estWorstCaseBlockSize(avgGasUsed), headerSize) blockSize := max(estWorstCaseBlockSize(avgGasUsed), headerSize)
@ -198,6 +202,7 @@ func (r *resultStore) GetCompleted(limit int) []*fetchResult {
for _, result := range results { for _, result := range results {
r.itemsGasUsed -= result.Header.GasUsed r.itemsGasUsed -= result.Header.GasUsed
} }
r.itemsCount -= len(results)
// Delete the results from the cache and clear the tail. // Delete the results from the cache and clear the tail.
copy(r.items, r.items[limit:]) copy(r.items, r.items[limit:])