Merge pull request #13880 from karalabe/remote-miner-fix

consensus/ethash, eth: don't mine if 0 threads are set

consensus/ethash/ethash.go

@@ -555,11 +555,18 @@ func (ethash *Ethash) Threads() int {
 
 // SetThreads updates the number of mining threads currently enabled. Calling
 // this method does not start mining, only sets the thread count. If zero is
-// specified, the miner will use all cores of the machine.
+// specified, the miner will use all cores of the machine. Setting a thread
+// count below zero is allowed and will cause the miner to idle, without any
+// work being done.
 func (ethash *Ethash) SetThreads(threads int) {
 	ethash.lock.Lock()
 	defer ethash.lock.Unlock()
 
+	// If we're running a shared PoW, set the thread count on that instead
+	if ethash.shared != nil {
+		ethash.shared.SetThreads(threads)
+		return
+	}
 	// Update the threads and ping any running seal to pull in any changes
 	ethash.threads = threads
 	select {

consensus/ethash/sealer.go

@@ -61,6 +61,9 @@ func (ethash *Ethash) Seal(chain consensus.ChainReader, block *types.Block, stop
 	if threads == 0 {
 		threads = runtime.NumCPU()
 	}
+	if threads < 0 {
+		threads = 0 // Allows disabling local mining without extra logic around local/remote
+	}
 	var pend sync.WaitGroup
 	for i := 0; i < threads; i++ {
 		pend.Add(1)

eth/api.go

@@ -139,16 +139,17 @@ func NewPrivateMinerAPI(e *Ethereum) *PrivateMinerAPI {
 // threads allowed to use.
 func (api *PrivateMinerAPI) Start(threads *int) error {
 	// Set the number of threads if the seal engine supports it
-	if threads != nil {
+	if threads == nil {
-		type threaded interface {
+		threads = new(int)
-			SetThreads(threads int)
+	} else if *threads == 0 {
-		}
+		*threads = -1 // Disable the miner from within
-		if th, ok := api.e.engine.(threaded); ok {
+	}
-			log.Info("Updated mining threads", "threads", *threads)
+	type threaded interface {
-			th.SetThreads(*threads)
+		SetThreads(threads int)
-		} else {
+	}
-			log.Warn("Current seal engine isn't threaded")
+	if th, ok := api.e.engine.(threaded); ok {
-		}
+		log.Info("Updated mining threads", "threads", *threads)
+		th.SetThreads(*threads)
 	}
 	// Start the miner and return
 	if !api.e.IsMining() {
@@ -159,6 +160,12 @@ func (api *PrivateMinerAPI) Start(threads *int) error {
 
 // Stop the miner
 func (api *PrivateMinerAPI) Stop() bool {
+	type threaded interface {
+		SetThreads(threads int)
+	}
+	if th, ok := api.e.engine.(threaded); ok {
+		th.SetThreads(-1)
+	}
 	api.e.StopMining()
 	return true
 }

eth/backend.go

@@ -240,8 +240,10 @@ func CreateConsensusEngine(ctx *node.ServiceContext, config *Config, chainConfig
 		log.Warn("Ethash used in shared mode")
 		return ethash.NewShared()
 	default:
-		return ethash.New(ctx.ResolvePath(config.EthashCacheDir), config.EthashCachesInMem, config.EthashCachesOnDisk,
+		engine := ethash.New(ctx.ResolvePath(config.EthashCacheDir), config.EthashCachesInMem, config.EthashCachesOnDisk,
 			config.EthashDatasetDir, config.EthashDatasetsInMem, config.EthashDatasetsOnDisk)
+		engine.SetThreads(-1) // Disable CPU mining
+		return engine
 	}
 }