tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

eth: discard fetched blocks that don't fit (no goroutine)

Browse Source
This commit is contained in:
Péter Szilágyi 2015-06-10 12:17:06 +03:00
parent 858a6f0be9
commit b9affbf9fe
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
eth/sync.go
View File

@ -200,23 +200,23 @@ func (pm *ProtocolManager) fetcher() {
case <-pm.quitSync: case <-pm.quitSync:
return return
} }
// If any explicit fetches were replied to, import them
if count := len(explicit); count > 0 {
glog.V(logger.Debug).Infof("Importing %d explicitly fetched blocks", count)
// Create a closure with the retrieved blocks and origin peers // Create a closure with the retrieved blocks and origin peers
peers := make([]*peer, 0, count) peers := make([]*peer, 0, len(explicit))
blocks := make([]*types.Block, 0, count) blocks = make([]*types.Block, 0, len(explicit))
for _, block := range explicit { for _, block := range explicit {
hash := block.Hash() hash := block.Hash()
if announce := pending[hash]; announce != nil { if announce := pending[hash]; announce != nil {
// Filter out blocks too new to import anyway
if !pm.chainman.HasBlock(hash) && pm.chainman.HasBlock(block.ParentHash()) {
peers = append(peers, announce.peer) peers = append(peers, announce.peer)
blocks = append(blocks, block) blocks = append(blocks, block)
}
delete(pending, hash) delete(pending, hash)
} }
} }
// Run the importer on a new thread // If any explicit fetches were replied to, import them
if count := len(blocks); count > 0 {
glog.V(logger.Debug).Infof("Importing %d explicitly fetched blocks", len(blocks))
go func() { go func() {
for i := 0; i < len(blocks); i++ { for i := 0; i < len(blocks); i++ {
if err := pm.importBlock(peers[i], blocks[i], nil); err != nil { if err := pm.importBlock(peers[i], blocks[i], nil); err != nil {