roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

eth: fix #1371, double lock during block/txn known set limitation

Browse Source
This commit is contained in:
Péter Szilágyi 2015-07-01 11:12:05 +03:00
parent 60454da650
commit 1ae80aaf64
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eth/peer.go
View File

@ -94,11 +94,8 @@ func (p *peer) SetTd(td *big.Int) {
// never be propagated to this particular peer. // never be propagated to this particular peer.
func (p *peer) MarkBlock(hash common.Hash) { func (p *peer) MarkBlock(hash common.Hash) {
// If we reached the memory allowance, drop a previously known block hash // If we reached the memory allowance, drop a previously known block hash
if p.knownBlocks.Size() >= maxKnownBlocks { for p.knownBlocks.Size() >= maxKnownBlocks {
p.knownBlocks.Each(func(item interface{}) bool { p.knownBlocks.Pop()
p.knownBlocks.Remove(item)
return p.knownBlocks.Size() >= maxKnownBlocks
})
} }
p.knownBlocks.Add(hash) p.knownBlocks.Add(hash)
} }
@ -107,11 +104,8 @@ func (p *peer) MarkBlock(hash common.Hash) {
// will never be propagated to this particular peer. // will never be propagated to this particular peer.
func (p *peer) MarkTransaction(hash common.Hash) { func (p *peer) MarkTransaction(hash common.Hash) {
// If we reached the memory allowance, drop a previously known transaction hash // If we reached the memory allowance, drop a previously known transaction hash
if p.knownTxs.Size() >= maxKnownTxs { for p.knownTxs.Size() >= maxKnownTxs {
p.knownTxs.Each(func(item interface{}) bool { p.knownTxs.Pop()
p.knownTxs.Remove(item)
return p.knownTxs.Size() >= maxKnownTxs
})
} }
p.knownTxs.Add(hash) p.knownTxs.Add(hash)
} }