forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

miner: commit new work when consensus engine is started

Browse source
This commit is contained in:
rjl493456442 2018-05-03 14:16:34 +08:00
parent 41a32a9475
commit a218f37bec
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
miner/agent.go
View file

@ -18,10 +18,10 @@ package miner
import ( import (
"sync" "sync"
"sync/atomic"
"github.com/ethereum/go-ethereum/consensus" "github.com/ethereum/go-ethereum/consensus"
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
"sync/atomic"
) )
type CpuAgent struct { type CpuAgent struct {

1
miner/miner.go
View file

@ -114,7 +114,6 @@ func (self *Miner) Start(coinbase common.Address) {
} }
if !self.worker.isRunning() { if !self.worker.isRunning() {
self.worker.start() self.worker.start()
self.worker.commitNewWork()
} }
} }

16
miner/worker.go
View file

@ -251,6 +251,11 @@ func (self *worker) update() {
defer self.chainHeadSub.Unsubscribe() defer self.chainHeadSub.Unsubscribe()
defer self.chainSideSub.Unsubscribe() defer self.chainSideSub.Unsubscribe()
ticker := time.NewTicker(500 * time.Millisecond)
defer ticker.Stop()
var started bool // Indication whether consensus engine is started
for { for {
// A real event arrived, process interesting content // A real event arrived, process interesting content
select { select {
@ -289,6 +294,17 @@ func (self *worker) update() {
} }
} }
// Commit new work when consensus engine is started.
case <-ticker.C:
if self.engine.IsRunning() {
if !started {
self.commitNewWork()
started = true
}
} else {
started = false
}
// System stopped // System stopped
case <-self.txsSub.Err(): case <-self.txsSub.Err():
return return