aboutsummaryrefslogtreecommitdiffstats
path: root/miner/worker.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-04-08 06:30:23 +0800
committerobscuren <geffobscura@gmail.com>2015-04-08 06:30:23 +0800
commitd09d2b96fcd90ed817cf6ae81671e4df9dba402f (patch)
tree6f1ff66cae51f96ee857a76c2196ac2aeb2df411 /miner/worker.go
parent7f32a08b6095bb5f1ff58168be70326ee0c29266 (diff)
downloaddexon-d09d2b96fcd90ed817cf6ae81671e4df9dba402f.tar
dexon-d09d2b96fcd90ed817cf6ae81671e4df9dba402f.tar.gz
dexon-d09d2b96fcd90ed817cf6ae81671e4df9dba402f.tar.bz2
dexon-d09d2b96fcd90ed817cf6ae81671e4df9dba402f.tar.lz
dexon-d09d2b96fcd90ed817cf6ae81671e4df9dba402f.tar.xz
dexon-d09d2b96fcd90ed817cf6ae81671e4df9dba402f.tar.zst
dexon-d09d2b96fcd90ed817cf6ae81671e4df9dba402f.zip
fixed stop of miner
Diffstat (limited to 'miner/worker.go')
-rw-r--r--miner/worker.go26
1 files changed, 12 insertions, 14 deletions
diff --git a/miner/worker.go b/miner/worker.go
index 8613df1c0..7f2728f9c 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -98,12 +98,11 @@ func newWorker(coinbase common.Address, eth core.Backend) *worker {
possibleUncles: make(map[common.Hash]*types.Block),
coinbase: coinbase,
txQueue: make(map[common.Hash]*types.Transaction),
+ quit: make(chan struct{}),
}
go worker.update()
go worker.wait()
- worker.quit = make(chan struct{})
-
worker.commitNewWork()
return worker
@@ -133,8 +132,14 @@ func (self *worker) start() {
}
func (self *worker) stop() {
- atomic.StoreInt64(&self.mining, 0)
+ if atomic.LoadInt64(&self.mining) == 1 {
+ // stop all agents
+ for _, agent := range self.agents {
+ agent.Stop()
+ }
+ }
+ atomic.StoreInt64(&self.mining, 0)
atomic.StoreInt64(&self.atWork, 0)
}
@@ -164,12 +169,7 @@ out:
self.commitNewWork()
}
}
-
case <-self.quit:
- // stop all agents
- for _, agent := range self.agents {
- agent.Stop()
- }
break out
case <-timer.C:
if glog.V(logger.Debug) {
@@ -261,20 +261,18 @@ func (self *worker) commitNewWork() {
// Keep track of transactions which return errors so they can be removed
var (
- remove types.Transactions
+ remove = set.New()
tcount = 0
)
gasLimit:
for i, tx := range transactions {
err := self.commitTransaction(tx)
switch {
- case core.IsNonceErr(err):
- fallthrough
- case core.IsInvalidTxErr(err):
+ case core.IsNonceErr(err) || core.IsInvalidTxErr(err):
// Remove invalid transactions
from, _ := tx.From()
self.chain.TxState().RemoveNonce(from, tx.Nonce())
- remove = append(remove, tx)
+ remove.Add(tx.Hash())
if glog.V(logger.Debug) {
glog.Infof("TX (%x) failed, will be removed: %v\n", tx.Hash().Bytes()[:4], err)
@@ -288,7 +286,7 @@ gasLimit:
tcount++
}
}
- self.eth.TxPool().RemoveSet(remove)
+ self.eth.TxPool().InvalidateSet(remove)
var (
uncles []*types.Header