diff options
Diffstat (limited to 'miner')
| -rw-r--r-- | miner/miner.go | 68 |
1 files changed, 55 insertions, 13 deletions
diff --git a/miner/miner.go b/miner/miner.go index 8143fcef7..359be4032 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -2,33 +2,63 @@ package miner import ( "math/big" + "sync/atomic" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/eth/downloader" + "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger/glog" "github.com/ethereum/go-ethereum/pow" ) type Miner struct { + mux *event.TypeMux + worker *worker MinAcceptedGasPrice *big.Int - threads int - mining bool - eth core.Backend - pow pow.PoW + threads int + coinbase common.Address + mining int32 + eth core.Backend + pow pow.PoW + + canStart int32 // can start indicates whether we can start the mining operation + shouldStart int32 // should start indicates whether we should start after sync } -func New(eth core.Backend, pow pow.PoW) *Miner { - return &Miner{eth: eth, pow: pow, worker: newWorker(common.Address{}, eth)} +func New(eth core.Backend, mux *event.TypeMux, pow pow.PoW) *Miner { + miner := &Miner{eth: eth, mux: mux, pow: pow, worker: newWorker(common.Address{}, eth), canStart: 1} + go miner.update() + + return miner } -func (self *Miner) Mining() bool { - return self.mining +func (self *Miner) update() { + events := self.mux.Subscribe(downloader.StartEvent{}, downloader.DoneEvent{}, downloader.FailedEvent{}) + for ev := range events.Chan() { + switch ev.(type) { + case downloader.StartEvent: + atomic.StoreInt32(&self.canStart, 0) + if self.Mining() { + self.Stop() + glog.V(logger.Info).Infoln("Mining operation aborted due to sync operation") + } + case downloader.DoneEvent, downloader.FailedEvent: + shouldStart := atomic.LoadInt32(&self.shouldStart) == 1 + + atomic.StoreInt32(&self.canStart, 1) + atomic.StoreInt32(&self.shouldStart, 0) + if shouldStart { + self.Start(self.coinbase, self.threads) + } + } + } } func (m *Miner) SetGasPrice(price *big.Int) { @@ -41,34 +71,46 @@ func (m *Miner) SetGasPrice(price *big.Int) { } func (self *Miner) Start(coinbase common.Address, threads int) { + atomic.StoreInt32(&self.shouldStart, 1) + self.threads = threads + self.worker.coinbase = coinbase + + if atomic.LoadInt32(&self.canStart) == 0 { + glog.V(logger.Info).Infoln("Can not start mining operation due to network sync (starts when finished)") + return + } - self.mining = true + atomic.StoreInt32(&self.mining, 1) for i := 0; i < threads; i++ { self.worker.register(NewCpuAgent(i, self.pow)) } - self.threads = threads glog.V(logger.Info).Infof("Starting mining operation (CPU=%d TOT=%d)\n", threads, len(self.worker.agents)) - self.worker.coinbase = coinbase self.worker.start() + self.worker.commitNewWork() } func (self *Miner) Stop() { self.worker.stop() - self.mining = false + atomic.StoreInt32(&self.mining, 0) + atomic.StoreInt32(&self.shouldStart, 0) } func (self *Miner) Register(agent Agent) { - if self.mining { + if atomic.LoadInt32(&self.mining) == 0 { agent.Start() } self.worker.register(agent) } +func (self *Miner) Mining() bool { + return atomic.LoadInt32(&self.mining) > 0 +} + func (self *Miner) HashRate() int64 { return self.pow.GetHashrate() } |