aboutsummaryrefslogtreecommitdiffstats
path: root/miner
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-03-25 20:51:12 +0800
committerobscuren <geffobscura@gmail.com>2015-03-25 20:51:12 +0800
commit950b4a68c8020a06675672355266e0668dfe5958 (patch)
treed9078b19d1d653dbfa0522c8c7af8c0bb17342ea /miner
parenta1cae93d78d7c0b7b0f69ca2439b2048a51933e7 (diff)
downloaddexon-950b4a68c8020a06675672355266e0668dfe5958.tar
dexon-950b4a68c8020a06675672355266e0668dfe5958.tar.gz
dexon-950b4a68c8020a06675672355266e0668dfe5958.tar.bz2
dexon-950b4a68c8020a06675672355266e0668dfe5958.tar.lz
dexon-950b4a68c8020a06675672355266e0668dfe5958.tar.xz
dexon-950b4a68c8020a06675672355266e0668dfe5958.tar.zst
dexon-950b4a68c8020a06675672355266e0668dfe5958.zip
Improved miner recovery
* In case of uncle mining (e.g. same TS) the miner would stop if all threads happened to mine a potential uncle
Diffstat (limited to 'miner')
-rw-r--r--miner/worker.go38
1 files changed, 16 insertions, 22 deletions
diff --git a/miner/worker.go b/miner/worker.go
index 1a6da505f..e0287ea8d 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -64,6 +64,7 @@ type worker struct {
mux *event.TypeMux
quit chan struct{}
pow pow.PoW
+ atWork int
eth core.Backend
chain *core.ChainManager
@@ -106,6 +107,7 @@ func (self *worker) start() {
func (self *worker) stop() {
self.mining = false
+ self.atWork = 0
close(self.quit)
}
@@ -116,7 +118,7 @@ func (self *worker) register(agent Agent) {
}
func (self *worker) update() {
- events := self.mux.Subscribe(core.ChainHeadEvent{}, core.NewMinedBlockEvent{}, core.ChainSideEvent{})
+ events := self.mux.Subscribe(core.ChainHeadEvent{}, core.ChainSideEvent{})
timer := time.NewTicker(2 * time.Second)
@@ -127,13 +129,15 @@ out:
switch ev := event.(type) {
case core.ChainHeadEvent:
self.commitNewWork()
- case core.NewMinedBlockEvent:
- //self.commitNewWork()
case core.ChainSideEvent:
self.uncleMu.Lock()
self.possibleUncles[ev.Block.Hash()] = ev.Block
self.uncleMu.Unlock()
}
+
+ if self.atWork == 0 {
+ self.commitNewWork()
+ }
case <-self.quit:
// stop all agents
for _, agent := range self.agents {
@@ -148,36 +152,25 @@ out:
events.Unsubscribe()
}
-func (self *worker) addUncle(uncle *types.Block) {
-}
-
func (self *worker) wait() {
for {
for block := range self.recv {
- // Someone Successfully Mined!
- //block := self.current.block
- //if block.Number().Uint64() == work.Number && block.Nonce() == 0 {
- //self.current.block.SetNonce(work.Nonce)
- //self.current.block.Header().MixDigest = common.BytesToHash(work.MixDigest)
-
- jsonlogger.LogJson(&logger.EthMinerNewBlock{
- BlockHash: block.Hash().Hex(),
- BlockNumber: block.Number(),
- ChainHeadHash: block.ParentHeaderHash.Hex(),
- BlockPrevHash: block.ParentHeaderHash.Hex(),
- })
-
if err := self.chain.InsertChain(types.Blocks{block}); err == nil {
for _, uncle := range block.Uncles() {
delete(self.possibleUncles, uncle.Hash())
}
-
self.mux.Post(core.NewMinedBlockEvent{block})
+
+ jsonlogger.LogJson(&logger.EthMinerNewBlock{
+ BlockHash: block.Hash().Hex(),
+ BlockNumber: block.Number(),
+ ChainHeadHash: block.ParentHeaderHash.Hex(),
+ BlockPrevHash: block.ParentHeaderHash.Hex(),
+ })
} else {
self.commitNewWork()
}
- //}
- break
+ self.atWork--
}
}
}
@@ -190,6 +183,7 @@ func (self *worker) push() {
// push new work to agents
for _, agent := range self.agents {
agent.Work() <- self.current.block.Copy()
+ self.atWork++
}
}
}