mirror of https://github.com/poanetwork/quorum.git
Merge pull request #3431 from karalabe/miner-race-fixes
Miner race fixes
This commit is contained in:
commit
f15828e901
|
@ -119,15 +119,14 @@ func (m *Miner) SetGasPrice(price *big.Int) {
|
||||||
|
|
||||||
func (self *Miner) Start(coinbase common.Address, threads int) {
|
func (self *Miner) Start(coinbase common.Address, threads int) {
|
||||||
atomic.StoreInt32(&self.shouldStart, 1)
|
atomic.StoreInt32(&self.shouldStart, 1)
|
||||||
self.threads = threads
|
self.worker.setEtherbase(coinbase)
|
||||||
self.worker.coinbase = coinbase
|
|
||||||
self.coinbase = coinbase
|
self.coinbase = coinbase
|
||||||
|
self.threads = threads
|
||||||
|
|
||||||
if atomic.LoadInt32(&self.canStart) == 0 {
|
if atomic.LoadInt32(&self.canStart) == 0 {
|
||||||
glog.V(logger.Info).Infoln("Can not start mining operation due to network sync (starts when finished)")
|
glog.V(logger.Info).Infoln("Can not start mining operation due to network sync (starts when finished)")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
atomic.StoreInt32(&self.mining, 1)
|
atomic.StoreInt32(&self.mining, 1)
|
||||||
|
|
||||||
for i := 0; i < threads; i++ {
|
for i := 0; i < threads; i++ {
|
||||||
|
@ -135,9 +134,7 @@ func (self *Miner) Start(coinbase common.Address, threads int) {
|
||||||
}
|
}
|
||||||
|
|
||||||
glog.V(logger.Info).Infof("Starting mining operation (CPU=%d TOT=%d)\n", threads, len(self.worker.agents))
|
glog.V(logger.Info).Infof("Starting mining operation (CPU=%d TOT=%d)\n", threads, len(self.worker.agents))
|
||||||
|
|
||||||
self.worker.start()
|
self.worker.start()
|
||||||
|
|
||||||
self.worker.commitNewWork()
|
self.worker.commitNewWork()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -177,8 +174,7 @@ func (self *Miner) SetExtra(extra []byte) error {
|
||||||
if uint64(len(extra)) > params.MaximumExtraDataSize.Uint64() {
|
if uint64(len(extra)) > params.MaximumExtraDataSize.Uint64() {
|
||||||
return fmt.Errorf("Extra exceeds max length. %d > %v", len(extra), params.MaximumExtraDataSize)
|
return fmt.Errorf("Extra exceeds max length. %d > %v", len(extra), params.MaximumExtraDataSize)
|
||||||
}
|
}
|
||||||
|
self.worker.setExtra(extra)
|
||||||
self.worker.extra = extra
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -188,9 +184,9 @@ func (self *Miner) Pending() (*types.Block, *state.StateDB) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// PendingBlock returns the currently pending block.
|
// PendingBlock returns the currently pending block.
|
||||||
//
|
//
|
||||||
// Note, to access both the pending block and the pending state
|
// Note, to access both the pending block and the pending state
|
||||||
// simultaneously, please use Pending(), as the pending state can
|
// simultaneously, please use Pending(), as the pending state can
|
||||||
// change between multiple method calls
|
// change between multiple method calls
|
||||||
func (self *Miner) PendingBlock() *types.Block {
|
func (self *Miner) PendingBlock() *types.Block {
|
||||||
return self.worker.pendingBlock()
|
return self.worker.pendingBlock()
|
||||||
|
|
|
@ -37,7 +37,7 @@ type hashrate struct {
|
||||||
type RemoteAgent struct {
|
type RemoteAgent struct {
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
|
|
||||||
quit chan struct{}
|
quitCh chan struct{}
|
||||||
workCh chan *Work
|
workCh chan *Work
|
||||||
returnCh chan<- *Result
|
returnCh chan<- *Result
|
||||||
|
|
||||||
|
@ -76,18 +76,16 @@ func (a *RemoteAgent) Start() {
|
||||||
if !atomic.CompareAndSwapInt32(&a.running, 0, 1) {
|
if !atomic.CompareAndSwapInt32(&a.running, 0, 1) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
a.quitCh = make(chan struct{})
|
||||||
a.quit = make(chan struct{})
|
|
||||||
a.workCh = make(chan *Work, 1)
|
a.workCh = make(chan *Work, 1)
|
||||||
go a.maintainLoop()
|
go a.loop(a.workCh, a.quitCh)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *RemoteAgent) Stop() {
|
func (a *RemoteAgent) Stop() {
|
||||||
if !atomic.CompareAndSwapInt32(&a.running, 1, 0) {
|
if !atomic.CompareAndSwapInt32(&a.running, 1, 0) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
close(a.quitCh)
|
||||||
close(a.quit)
|
|
||||||
close(a.workCh)
|
close(a.workCh)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -148,15 +146,20 @@ func (a *RemoteAgent) SubmitWork(nonce uint64, mixDigest, hash common.Hash) bool
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *RemoteAgent) maintainLoop() {
|
// loop monitors mining events on the work and quit channels, updating the internal
|
||||||
|
// state of the rmeote miner until a termination is requested.
|
||||||
|
//
|
||||||
|
// Note, the reason the work and quit channels are passed as parameters is because
|
||||||
|
// RemoteAgent.Start() constantly recreates these channels, so the loop code cannot
|
||||||
|
// assume data stability in these member fields.
|
||||||
|
func (a *RemoteAgent) loop(workCh chan *Work, quitCh chan struct{}) {
|
||||||
ticker := time.Tick(5 * time.Second)
|
ticker := time.Tick(5 * time.Second)
|
||||||
|
|
||||||
out:
|
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case <-a.quit:
|
case <-quitCh:
|
||||||
break out
|
return
|
||||||
case work := <-a.workCh:
|
case work := <-workCh:
|
||||||
a.mu.Lock()
|
a.mu.Lock()
|
||||||
a.currentWork = work
|
a.currentWork = work
|
||||||
a.mu.Unlock()
|
a.mu.Unlock()
|
||||||
|
|
|
@ -161,6 +161,12 @@ func (self *worker) setEtherbase(addr common.Address) {
|
||||||
self.coinbase = addr
|
self.coinbase = addr
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (self *worker) setExtra(extra []byte) {
|
||||||
|
self.mu.Lock()
|
||||||
|
defer self.mu.Unlock()
|
||||||
|
self.extra = extra
|
||||||
|
}
|
||||||
|
|
||||||
func (self *worker) pending() (*types.Block, *state.StateDB) {
|
func (self *worker) pending() (*types.Block, *state.StateDB) {
|
||||||
self.currentMu.Lock()
|
self.currentMu.Lock()
|
||||||
defer self.currentMu.Unlock()
|
defer self.currentMu.Unlock()
|
||||||
|
|
Loading…
Reference in New Issue