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

light fetcher shutdown

Browse source
This commit is contained in:
zsfelfoldi 2016-06-26 11:41:20 +02:00
parent a09e88d4bf
commit 78a077372c
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
les/fetcher.go
View file

@ -115,6 +115,8 @@ func (f *lightFetcher) fetchBestFromPool() *peer {
func (f *lightFetcher) syncLoop() { func (f *lightFetcher) syncLoop() {
for { for {
select { select {
case <-f.pm.quitSync:
return
case <-f.syncPoolNotify: case <-f.syncPoolNotify:
chn := f.pm.getSyncLock(false) chn := f.pm.getSyncLock(false)
if chn != nil { if chn != nil {
@ -131,13 +133,14 @@ func (f *lightFetcher) syncLoop() {
}() }()
} }
} }
case <-f.pm.quitSync:
return
} }
} }
} }
func (f *lightFetcher) syncWithPeer(p *peer) bool { func (f *lightFetcher) syncWithPeer(p *peer) bool {
f.pm.wg.Add(1)
defer f.pm.wg.Done()
headNum := f.chain.CurrentHeader().Number.Uint64() headNum := f.chain.CurrentHeader().Number.Uint64()
peerHead := p.headBlockInfo() peerHead := p.headBlockInfo()

2
les/sync.go
View file

@ -60,7 +60,7 @@ func (pm *ProtocolManager) syncer() {
func (pm *ProtocolManager) needToSync(peerHead blockInfo) bool { func (pm *ProtocolManager) needToSync(peerHead blockInfo) bool {
head := pm.blockchain.CurrentHeader() head := pm.blockchain.CurrentHeader()
currentTd := core.GetTd(pm.chainDb, head.Hash(), head.Number.Uint64()) currentTd := core.GetTd(pm.chainDb, head.Hash(), head.Number.Uint64())
return peerHead.Td.Cmp(currentTd) > 0 return currentTd != nil && peerHead.Td.Cmp(currentTd) > 0
} }
// synchronise tries to sync up our local block chain with a remote peer. // synchronise tries to sync up our local block chain with a remote peer.