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

eth/downloader: sync the cancel channel during cancel too

Browse Source
This commit is contained in:
Péter Szilágyi 2015-05-13 14:01:08 +03:00
parent ee0c892303
commit ec57aa64cd
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
eth/downloader/downloader.go
View File

@ -190,32 +190,15 @@ func (d *Downloader) syncWithPeer(p *peer, hash common.Hash) (err error) {
// Cancel cancels all of the operations and resets the queue. It returns true // Cancel cancels all of the operations and resets the queue. It returns true
// if the cancel operation was completed. // if the cancel operation was completed.
func (d *Downloader) Cancel() bool { func (d *Downloader) Cancel() bool {
hs, bs := d.queue.Size()
// If we're not syncing just return. // If we're not syncing just return.
hs, bs := d.queue.Size()
if atomic.LoadInt32(&d.synchronising) == 0 && hs == 0 && bs == 0 { if atomic.LoadInt32(&d.synchronising) == 0 && hs == 0 && bs == 0 {
return false return false
} }
// Close the current cancel channel
d.cancelLock.RLock()
close(d.cancelCh) close(d.cancelCh)
d.cancelLock.RUnlock()
// clean up
hashDone:
for {
select {
case <-d.hashCh:
default:
break hashDone
}
}
blockDone:
for {
select {
case <-d.blockCh:
default:
break blockDone
}
}
// reset the queue // reset the queue
d.queue.Reset() d.queue.Reset()