forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 15:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

eth/downloader: fix review issues

Browse source
This commit is contained in:
Felix Lange 2017-01-19 13:12:26 +01:00
parent 751754dbdf
commit 22a48fe5e8
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
eth/downloader/queue.go
View file

@ -206,9 +206,12 @@ func (q *queue) PendingReceipts() int {
func (q *queue) PendingNodeData() int { func (q *queue) PendingNodeData() int {
q.lock.Lock() q.lock.Lock()
defer q.lock.Unlock() defer q.lock.Unlock()
return q.pendingNodeDataLocked() return q.pendingNodeDataLocked()
} }
// pendingNodeDataLocked retrieves the number of node data entries pending for retrieval.
// The caller must hold q.lock.
func (q *queue) pendingNodeDataLocked() int { func (q *queue) pendingNodeDataLocked() int {
var n int var n int
if q.stateScheduler != nil { if q.stateScheduler != nil {
@ -270,7 +273,6 @@ func (q *queue) Idle() bool {
if q.stateScheduler != nil { if q.stateScheduler != nil {
queued += q.stateScheduler.Pending() queued += q.stateScheduler.Pending()
} }
return (queued + pending + cached) == 0 return (queued + pending + cached) == 0
} }
@ -1091,10 +1093,7 @@ func (q *queue) DeliverNodeData(id string, data [][]byte, callback func(int, boo
// scheduler treats everything as written after Process has returned, but it's // scheduler treats everything as written after Process has returned, but it's
// unlikely to be an issue in practice. // unlikely to be an issue in practice.
batch := q.stateDatabase.NewBatch() batch := q.stateDatabase.NewBatch()
progressed, i, err := q.stateScheduler.Process(process, batch) progressed, _, processErr := q.stateScheduler.Process(process, batch)
if err != nil {
return i, err
}
q.stateWriters += 1 q.stateWriters += 1
go func() { go func() {
defer func() { defer func() {
@ -1105,6 +1104,11 @@ func (q *queue) DeliverNodeData(id string, data [][]byte, callback func(int, boo
// waiting for completion of the pivot block's state download. // waiting for completion of the pivot block's state download.
q.active.Signal() q.active.Signal()
}() }()
if processErr != nil {
// Return processing errors through the callback so the sync gets canceled.
callback(len(process), progressed, processErr)
return
}
err := batch.Write() err := batch.Write()
callback(len(process), progressed, err) callback(len(process), progressed, err)
}() }()