aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2016-12-13 19:42:33 +0800
committerPéter Szilágyi <peterke@gmail.com>2016-12-13 20:03:57 +0800
commitb750cab56a724b2ff0bff3fab0849cb776a4f392 (patch)
tree9fd88d28f8ac15d00e0400d6e82d34288453ea00
parenta98e8c0889d7c4c1bded452c577bd4b9c7fa0f6b (diff)
downloadgo-tangerine-b750cab56a724b2ff0bff3fab0849cb776a4f392.tar
go-tangerine-b750cab56a724b2ff0bff3fab0849cb776a4f392.tar.gz
go-tangerine-b750cab56a724b2ff0bff3fab0849cb776a4f392.tar.bz2
go-tangerine-b750cab56a724b2ff0bff3fab0849cb776a4f392.tar.lz
go-tangerine-b750cab56a724b2ff0bff3fab0849cb776a4f392.tar.xz
go-tangerine-b750cab56a724b2ff0bff3fab0849cb776a4f392.tar.zst
go-tangerine-b750cab56a724b2ff0bff3fab0849cb776a4f392.zip
miner: fix a race between remote agent start/loop
-rw-r--r--miner/remote_agent.go25
1 files changed, 14 insertions, 11 deletions
diff --git a/miner/remote_agent.go b/miner/remote_agent.go
index 00b5f7e08..1a27a1312 100644
--- a/miner/remote_agent.go
+++ b/miner/remote_agent.go
@@ -37,7 +37,7 @@ type hashrate struct {
type RemoteAgent struct {
mu sync.Mutex
- quit chan struct{}
+ quitCh chan struct{}
workCh chan *Work
returnCh chan<- *Result
@@ -76,18 +76,16 @@ func (a *RemoteAgent) Start() {
if !atomic.CompareAndSwapInt32(&a.running, 0, 1) {
return
}
-
- a.quit = make(chan struct{})
+ a.quitCh = make(chan struct{})
a.workCh = make(chan *Work, 1)
- go a.maintainLoop()
+ go a.loop(a.workCh, a.quitCh)
}
func (a *RemoteAgent) Stop() {
if !atomic.CompareAndSwapInt32(&a.running, 1, 0) {
return
}
-
- close(a.quit)
+ close(a.quitCh)
close(a.workCh)
}
@@ -148,15 +146,20 @@ func (a *RemoteAgent) SubmitWork(nonce uint64, mixDigest, hash common.Hash) bool
return false
}
-func (a *RemoteAgent) maintainLoop() {
+// loop monitors mining events on the work and quit channels, updating the internal
+// state of the rmeote miner until a termination is requested.
+//
+// Note, the reason the work and quit channels are passed as parameters is because
+// RemoteAgent.Start() constantly recreates these channels, so the loop code cannot
+// assume data stability in these member fields.
+func (a *RemoteAgent) loop(workCh chan *Work, quitCh chan struct{}) {
ticker := time.Tick(5 * time.Second)
-out:
for {
select {
- case <-a.quit:
- break out
- case work := <-a.workCh:
+ case <-quitCh:
+ return
+ case work := <-workCh:
a.mu.Lock()
a.currentWork = work
a.mu.Unlock()