tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

agent/miner Prevent the CpuAgent to be started multiple times

Browse Source
This commit is contained in:
Bas van Kervel 2015-09-08 11:27:55 +02:00
parent e2d7c1a523
commit 618065895b
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
miner/agent.go
View File

@ -23,6 +23,7 @@ import (
"github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog" "github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/pow" "github.com/ethereum/go-ethereum/pow"
"sync/atomic"
) )
type CpuAgent struct { type CpuAgent struct {
@ -35,6 +36,8 @@ type CpuAgent struct {
index int index int
pow pow.PoW pow pow.PoW
isMining int32 // isMining indicates whether the agent is currently mining
} }
func NewCpuAgent(index int, pow pow.PoW) *CpuAgent { func NewCpuAgent(index int, pow pow.PoW) *CpuAgent {
@ -58,8 +61,12 @@ func (self *CpuAgent) Stop() {
} }
func (self *CpuAgent) Start() { func (self *CpuAgent) Start() {
self.mu.Lock()
defer self.mu.Unlock() defer self.mu.Unlock()
self.mu.Lock()
if atomic.LoadInt32(&self.isMining) == 1 {
return // agent already started
}
self.quit = make(chan struct{}) self.quit = make(chan struct{})
// creating current op ch makes sure we're not closing a nil ch // creating current op ch makes sure we're not closing a nil ch
@ -67,6 +74,8 @@ func (self *CpuAgent) Start() {
self.workCh = make(chan *Work, 1) self.workCh = make(chan *Work, 1)
go self.update() go self.update()
atomic.StoreInt32(&self.isMining, 1)
} }
func (self *CpuAgent) update() { func (self *CpuAgent) update() {
@ -99,10 +108,11 @@ done:
case <-self.workCh: case <-self.workCh:
default: default:
close(self.workCh) close(self.workCh)
break done break done
} }
} }
atomic.StoreInt32(&self.isMining, 0)
} }
func (self *CpuAgent) mine(work *Work, stop <-chan struct{}) { func (self *CpuAgent) mine(work *Work, stop <-chan struct{}) {