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

eth/downloader: remove weird defer statement

Browse source 
If the callback crashes, signaling the queue won't help.
This commit is contained in:
Felix Lange 2017-01-20 14:42:47 +01:00
parent 26193db7cf
commit 6f36588f47
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
eth/downloader/queue.go
View file

@ -1096,10 +1096,6 @@ func (q *queue) DeliverNodeData(id string, data [][]byte, callback func(int, boo
progressed, nproc, procerr := q.stateScheduler.Process(process, batch) progressed, nproc, procerr := q.stateScheduler.Process(process, batch)
q.stateWriters += 1 q.stateWriters += 1
go func() { go func() {
// Wake up WaitResults after the state has been written because it might be
// waiting for completion of the pivot block's state download.
defer q.active.Signal()
if procerr == nil { if procerr == nil {
nproc = len(process) nproc = len(process)
procerr = batch.Write() procerr = batch.Write()
@ -1111,6 +1107,9 @@ func (q *queue) DeliverNodeData(id string, data [][]byte, callback func(int, boo
q.stateWriters -= 1 q.stateWriters -= 1
q.lock.Unlock() q.lock.Unlock()
callback(nproc, progressed, procerr) callback(nproc, progressed, procerr)
// Wake up WaitResults after the state has been written because it might be
// waiting for completion of the pivot block's state download.
q.active.Signal()
}() }()
// If none of the data items were good, it's a stale delivery // If none of the data items were good, it's a stale delivery