miner: synchronise start / stop
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:
parent
016ad3e962
commit
8c38f8d815
@ -20,6 +20,7 @@ import (
|
||||
"errors"
|
||||
"math/big"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
|
||||
"github.com/ethereum/ethash"
|
||||
@ -45,6 +46,8 @@ type RemoteAgent struct {
|
||||
|
||||
hashrateMu sync.RWMutex
|
||||
hashrate map[common.Hash]hashrate
|
||||
|
||||
running int32 // running indicates whether the agent is active. Call atomically
|
||||
}
|
||||
|
||||
func NewRemoteAgent() *RemoteAgent {
|
||||
@ -70,19 +73,23 @@ func (a *RemoteAgent) SetReturnCh(returnCh chan<- *Result) {
|
||||
}
|
||||
|
||||
func (a *RemoteAgent) Start() {
|
||||
if !atomic.CompareAndSwapInt32(&a.running, 0, 1) {
|
||||
return
|
||||
}
|
||||
|
||||
a.quit = make(chan struct{})
|
||||
a.workCh = make(chan *Work, 1)
|
||||
go a.maintainLoop()
|
||||
}
|
||||
|
||||
func (a *RemoteAgent) Stop() {
|
||||
if a.quit != nil {
|
||||
if !atomic.CompareAndSwapInt32(&a.running, 1, 0) {
|
||||
return
|
||||
}
|
||||
|
||||
close(a.quit)
|
||||
}
|
||||
if a.workCh != nil {
|
||||
close(a.workCh)
|
||||
}
|
||||
}
|
||||
|
||||
// GetHashRate returns the accumulated hashrate of all identifier combined
|
||||
func (a *RemoteAgent) GetHashRate() (tot int64) {
|
||||
|
Loading…
Reference in New Issue
Block a user