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

Merge pull request #1780 from bas-vk/miner-crash

Browse Source 
agent/miner Prevent the CpuAgent to be started multiple times
This commit is contained in:
Jeffrey Wilcke 2015-09-09 04:49:28 -07:00
commit 28b13a4d1e
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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 {
@ -60,6 +63,10 @@ func (self *CpuAgent) Stop() {
func (self *CpuAgent) Start() { func (self *CpuAgent) Start() {
self.mu.Lock() self.mu.Lock()
defer self.mu.Unlock() defer self.mu.Unlock()
if !atomic.CompareAndSwapInt32(&self.isMining, 0, 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
@ -99,10 +106,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{}) {