interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

miner: use 32bit atomic operations 

64bit atomic operations are not available on all 32bit platforms.
This commit is contained in:
Felix Lange 2015-04-22 10:58:43 +02:00
parent 9d152d6191
commit 96e2b6bc07
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
miner/worker.go
View File

@ -66,7 +66,6 @@ type worker struct {
mux *event.TypeMux mux *event.TypeMux
quit chan struct{} quit chan struct{}
pow pow.PoW pow pow.PoW
atWork int64
eth core.Backend eth core.Backend
chain *core.ChainManager chain *core.ChainManager
@ -84,7 +83,9 @@ type worker struct {
txQueueMu sync.Mutex txQueueMu sync.Mutex
txQueue map[common.Hash]*types.Transaction txQueue map[common.Hash]*types.Transaction
mining int64 // atomic status counters
mining int32
atWork int32
} }
func newWorker(coinbase common.Address, eth core.Backend) *worker { func newWorker(coinbase common.Address, eth core.Backend) *worker {
@ -127,19 +128,19 @@ func (self *worker) start() {
agent.Start() agent.Start()
} }
atomic.StoreInt64(&self.mining, 1) atomic.StoreInt32(&self.mining, 1)
} }
func (self *worker) stop() { func (self *worker) stop() {
if atomic.LoadInt64(&self.mining) == 1 { if atomic.LoadInt32(&self.mining) == 1 {
// stop all agents // stop all agents
for _, agent := range self.agents { for _, agent := range self.agents {
agent.Stop() agent.Stop()
} }
} }
atomic.StoreInt64(&self.mining, 0) atomic.StoreInt32(&self.mining, 0)
atomic.StoreInt64(&self.atWork, 0) atomic.StoreInt32(&self.atWork, 0)
} }
func (self *worker) register(agent Agent) { func (self *worker) register(agent Agent) {
@ -162,7 +163,7 @@ out:
self.possibleUncles[ev.Block.Hash()] = ev.Block self.possibleUncles[ev.Block.Hash()] = ev.Block
self.uncleMu.Unlock() self.uncleMu.Unlock()
case core.TxPreEvent: case core.TxPreEvent:
if atomic.LoadInt64(&self.mining) == 0 { if atomic.LoadInt32(&self.mining) == 0 {
self.commitNewWork() self.commitNewWork()
} }
} }
@ -177,7 +178,7 @@ out:
func (self *worker) wait() { func (self *worker) wait() {
for { for {
for block := range self.recv { for block := range self.recv {
atomic.AddInt64(&self.atWork, -1) atomic.AddInt32(&self.atWork, -1)
if block == nil { if block == nil {
continue continue
@ -205,13 +206,13 @@ func (self *worker) wait() {
} }
func (self *worker) push() { func (self *worker) push() {
if atomic.LoadInt64(&self.mining) == 1 { if atomic.LoadInt32(&self.mining) == 1 {
self.current.block.Header().GasUsed = self.current.totalUsedGas self.current.block.Header().GasUsed = self.current.totalUsedGas
self.current.block.SetRoot(self.current.state.Root()) self.current.block.SetRoot(self.current.state.Root())
// push new work to agents // push new work to agents
for _, agent := range self.agents { for _, agent := range self.agents {
atomic.AddInt64(&self.atWork, 1) atomic.AddInt32(&self.atWork, 1)
if agent.Work() != nil { if agent.Work() != nil {
agent.Work() <- self.current.block.Copy() agent.Work() <- self.current.block.Copy()
@ -320,7 +321,7 @@ func (self *worker) commitNewWork() {
} }
// We only care about logging if we're actually mining // We only care about logging if we're actually mining
if atomic.LoadInt64(&self.mining) == 1 { if atomic.LoadInt32(&self.mining) == 1 {
glog.V(logger.Info).Infof("commit new work on block %v with %d txs & %d uncles\n", self.current.block.Number(), tcount, len(uncles)) glog.V(logger.Info).Infof("commit new work on block %v with %d txs & %d uncles\n", self.current.block.Number(), tcount, len(uncles))
} }