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

eth/fetcher: get rid of the atomic integer

Browse source
This commit is contained in:
Gary Rong 2024-09-06 16:25:37 +08:00
parent 54336c23d3
commit f12ed6a7a6
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
eth/fetcher/tx_fetcher.go
View file

@ -22,7 +22,6 @@ import (
"math" "math"
mrand "math/rand" mrand "math/rand"
"sort" "sort"
"sync/atomic"
"time" "time"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
@ -176,7 +175,7 @@ type TxFetcher struct {
drop chan *txDrop drop chan *txDrop
quit chan struct{} quit chan struct{}
txSeq atomic.Uint64 // Unique transaction sequence number txSeq uint64 // Unique transaction sequence number
underpriced *lru.Cache[common.Hash, time.Time] // Transactions discarded as too cheap (don't re-fetch) underpriced *lru.Cache[common.Hash, time.Time] // Transactions discarded as too cheap (don't re-fetch)
// Stage 1: Waiting lists for newly discovered transactions that might be // Stage 1: Waiting lists for newly discovered transactions that might be
@ -443,6 +442,14 @@ func (f *TxFetcher) loop() {
idleWait = len(f.waittime) == 0 idleWait = len(f.waittime) == 0
_, oldPeer = f.announces[ann.origin] _, oldPeer = f.announces[ann.origin]
hasBlob bool hasBlob bool
// nextSeq returns the next available sequence number for tagging
// transaction announcement and also bump it internally.
nextSeq = func() uint64 {
seq := f.txSeq
f.txSeq++
return seq
}
) )
for i, hash := range ann.hashes { for i, hash := range ann.hashes {
// If the transaction is already downloading, add it to the list // If the transaction is already downloading, add it to the list
@ -455,13 +462,13 @@ func (f *TxFetcher) loop() {
if announces := f.announces[ann.origin]; announces != nil { if announces := f.announces[ann.origin]; announces != nil {
announces[hash] = &txMetadataWithSeq{ announces[hash] = &txMetadataWithSeq{
txMetadata: ann.metas[i], txMetadata: ann.metas[i],
seq: f.txSeq.Add(1), seq: nextSeq(),
} }
} else { } else {
f.announces[ann.origin] = map[common.Hash]*txMetadataWithSeq{ f.announces[ann.origin] = map[common.Hash]*txMetadataWithSeq{
hash: { hash: {
txMetadata: ann.metas[i], txMetadata: ann.metas[i],
seq: f.txSeq.Add(1), seq: nextSeq(),
}, },
} }
} }
@ -476,13 +483,13 @@ func (f *TxFetcher) loop() {
if announces := f.announces[ann.origin]; announces != nil { if announces := f.announces[ann.origin]; announces != nil {
announces[hash] = &txMetadataWithSeq{ announces[hash] = &txMetadataWithSeq{
txMetadata: ann.metas[i], txMetadata: ann.metas[i],
seq: f.txSeq.Add(1), seq: nextSeq(),
} }
} else { } else {
f.announces[ann.origin] = map[common.Hash]*txMetadataWithSeq{ f.announces[ann.origin] = map[common.Hash]*txMetadataWithSeq{
hash: { hash: {
txMetadata: ann.metas[i], txMetadata: ann.metas[i],
seq: f.txSeq.Add(1), seq: nextSeq(),
}, },
} }
} }
@ -503,13 +510,13 @@ func (f *TxFetcher) loop() {
if waitslots := f.waitslots[ann.origin]; waitslots != nil { if waitslots := f.waitslots[ann.origin]; waitslots != nil {
waitslots[hash] = &txMetadataWithSeq{ waitslots[hash] = &txMetadataWithSeq{
txMetadata: ann.metas[i], txMetadata: ann.metas[i],
seq: f.txSeq.Add(1), seq: nextSeq(),
} }
} else { } else {
f.waitslots[ann.origin] = map[common.Hash]*txMetadataWithSeq{ f.waitslots[ann.origin] = map[common.Hash]*txMetadataWithSeq{
hash: { hash: {
txMetadata: ann.metas[i], txMetadata: ann.metas[i],
seq: f.txSeq.Add(1), seq: nextSeq(),
}, },
} }
} }
@ -529,13 +536,13 @@ func (f *TxFetcher) loop() {
if waitslots := f.waitslots[ann.origin]; waitslots != nil { if waitslots := f.waitslots[ann.origin]; waitslots != nil {
waitslots[hash] = &txMetadataWithSeq{ waitslots[hash] = &txMetadataWithSeq{
txMetadata: ann.metas[i], txMetadata: ann.metas[i],
seq: f.txSeq.Add(1), seq: nextSeq(),
} }
} else { } else {
f.waitslots[ann.origin] = map[common.Hash]*txMetadataWithSeq{ f.waitslots[ann.origin] = map[common.Hash]*txMetadataWithSeq{
hash: { hash: {
txMetadata: ann.metas[i], txMetadata: ann.metas[i],
seq: f.txSeq.Add(1), seq: nextSeq(),
}, },
} }
} }
@ -997,7 +1004,7 @@ func (f *TxFetcher) forEachAnnounce(announces map[common.Hash]*txMetadataWithSeq
meta txMetadata meta txMetadata
seq uint64 seq uint64
} }
// process announcements by their arrival order // Process announcements by their arrival order
list := make([]announcement, 0, len(announces)) list := make([]announcement, 0, len(announces))
for hash, entry := range announces { for hash, entry := range announces {
list = append(list, announcement{hash: hash, meta: entry.txMetadata, seq: entry.seq}) list = append(list, announcement{hash: hash, meta: entry.txMetadata, seq: entry.seq})