aboutsummaryrefslogtreecommitdiffstats
path: root/eth/downloader/peer.go
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2015-11-04 18:18:48 +0800
committerPéter Szilágyi <peterke@gmail.com>2015-11-04 19:11:52 +0800
commitb658a73ed5205b0f35fdff98e587140026be66e6 (patch)
treeb511a96d71ad16203aeed5cf59f8915af1522666 /eth/downloader/peer.go
parentdda3bf3ce7ef109541adb6f0020f8d2dd28e5e51 (diff)
downloadgo-tangerine-b658a73ed5205b0f35fdff98e587140026be66e6.tar
go-tangerine-b658a73ed5205b0f35fdff98e587140026be66e6.tar.gz
go-tangerine-b658a73ed5205b0f35fdff98e587140026be66e6.tar.bz2
go-tangerine-b658a73ed5205b0f35fdff98e587140026be66e6.tar.lz
go-tangerine-b658a73ed5205b0f35fdff98e587140026be66e6.tar.xz
go-tangerine-b658a73ed5205b0f35fdff98e587140026be66e6.tar.zst
go-tangerine-b658a73ed5205b0f35fdff98e587140026be66e6.zip
eth/downloader: fix dysfunctional ignore list hidden by generic set
Diffstat (limited to 'eth/downloader/peer.go')
-rw-r--r--eth/downloader/peer.go45
1 files changed, 40 insertions, 5 deletions
diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go
index 1f457cb15..9ba6dabbd 100644
--- a/eth/downloader/peer.go
+++ b/eth/downloader/peer.go
@@ -28,9 +28,11 @@ import (
"time"
"github.com/ethereum/go-ethereum/common"
- "gopkg.in/fatih/set.v0"
)
+// Maximum number of entries allowed on the list or lacking items.
+const maxLackingHashes = 4096
+
// Hash and block fetchers belonging to eth/61 and below
type relativeHashFetcherFn func(common.Hash) error
type absoluteHashFetcherFn func(uint64, int) error
@@ -67,7 +69,8 @@ type peer struct {
receiptStarted time.Time // Time instance when the last receipt fetch was started
stateStarted time.Time // Time instance when the last node data fetch was started
- ignored *set.Set // Set of hashes not to request (didn't have previously)
+ lacking map[common.Hash]struct{} // Set of hashes not to request (didn't have previously)
+ lackingLock sync.RWMutex // Lock protecting the lacking hashes list
getRelHashes relativeHashFetcherFn // [eth/61] Method to retrieve a batch of hashes from an origin hash
getAbsHashes absoluteHashFetcherFn // [eth/61] Method to retrieve a batch of hashes from an absolute position
@@ -95,7 +98,7 @@ func newPeer(id string, version int, head common.Hash,
blockCapacity: 1,
receiptCapacity: 1,
stateCapacity: 1,
- ignored: set.New(),
+ lacking: make(map[common.Hash]struct{}),
getRelHashes: getRelHashes,
getAbsHashes: getAbsHashes,
@@ -119,7 +122,10 @@ func (p *peer) Reset() {
atomic.StoreInt32(&p.blockCapacity, 1)
atomic.StoreInt32(&p.receiptCapacity, 1)
atomic.StoreInt32(&p.stateCapacity, 1)
- p.ignored.Clear()
+
+ p.lackingLock.Lock()
+ p.lacking = make(map[common.Hash]struct{})
+ p.lackingLock.Unlock()
}
// Fetch61 sends a block retrieval request to the remote peer.
@@ -305,13 +311,42 @@ func (p *peer) Demote() {
}
}
+// MarkLacking appends a new entity to the set of items (blocks, receipts, states)
+// that a peer is known not to have (i.e. have been requested before). If the
+// set reaches its maximum allowed capacity, items are randomly dropped off.
+func (p *peer) MarkLacking(hash common.Hash) {
+ p.lackingLock.Lock()
+ defer p.lackingLock.Unlock()
+
+ for len(p.lacking) >= maxLackingHashes {
+ for drop, _ := range p.lacking {
+ delete(p.lacking, drop)
+ break
+ }
+ }
+ p.lacking[hash] = struct{}{}
+}
+
+// Lacks retrieves whether the hash of a blockchain item is on the peers lacking
+// list (i.e. whether we know that the peer does not have it).
+func (p *peer) Lacks(hash common.Hash) bool {
+ p.lackingLock.RLock()
+ defer p.lackingLock.RUnlock()
+
+ _, ok := p.lacking[hash]
+ return ok
+}
+
// String implements fmt.Stringer.
func (p *peer) String() string {
+ p.lackingLock.RLock()
+ defer p.lackingLock.RUnlock()
+
return fmt.Sprintf("Peer %s [%s]", p.id,
fmt.Sprintf("reputation %3d, ", atomic.LoadInt32(&p.rep))+
fmt.Sprintf("block cap %3d, ", atomic.LoadInt32(&p.blockCapacity))+
fmt.Sprintf("receipt cap %3d, ", atomic.LoadInt32(&p.receiptCapacity))+
- fmt.Sprintf("ignored %4d", p.ignored.Size()),
+ fmt.Sprintf("lacking %4d", len(p.lacking)),
)
}