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

miner: synchronise start / stop

Browse Source 
This PR fixes an issue where the remote worker was stopped twice and not
properly handled. This adds a synchronised running check to the start
and stop methods preventing closing of a channel more than once.
This commit is contained in:
Jeffrey Wilcke 2015-10-31 02:18:41 +01:00
parent 016ad3e962
commit 8c38f8d815
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
miner/remote_agent.go
View File

@ -20,6 +20,7 @@ import (
"errors" "errors"
"math/big" "math/big"
"sync" "sync"
"sync/atomic"
"time" "time"
"github.com/ethereum/ethash" "github.com/ethereum/ethash"
@ -45,6 +46,8 @@ type RemoteAgent struct {
hashrateMu sync.RWMutex hashrateMu sync.RWMutex
hashrate map[common.Hash]hashrate hashrate map[common.Hash]hashrate
running int32 // running indicates whether the agent is active. Call atomically
} }
func NewRemoteAgent() *RemoteAgent { func NewRemoteAgent() *RemoteAgent {
@ -70,19 +73,23 @@ func (a *RemoteAgent) SetReturnCh(returnCh chan<- *Result) {
} }
func (a *RemoteAgent) Start() { func (a *RemoteAgent) Start() {
if !atomic.CompareAndSwapInt32(&a.running, 0, 1) {
return
}
a.quit = make(chan struct{}) a.quit = make(chan struct{})
a.workCh = make(chan *Work, 1) a.workCh = make(chan *Work, 1)
go a.maintainLoop() go a.maintainLoop()
} }
func (a *RemoteAgent) Stop() { func (a *RemoteAgent) Stop() {
if a.quit != nil { if !atomic.CompareAndSwapInt32(&a.running, 1, 0) {
return
}
close(a.quit) close(a.quit)
}
if a.workCh != nil {
close(a.workCh) close(a.workCh)
} }
}
// GetHashRate returns the accumulated hashrate of all identifier combined // GetHashRate returns the accumulated hashrate of all identifier combined
func (a *RemoteAgent) GetHashRate() (tot int64) { func (a *RemoteAgent) GetHashRate() (tot int64) {