aboutsummaryrefslogtreecommitdiffstats
path: root/miner/miner.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-05-13 01:05:33 +0800
committerobscuren <geffobscura@gmail.com>2015-05-13 01:05:33 +0800
commit8e24378cc1acb074b56de75bf0baf6feb7927677 (patch)
tree71f866652de6b45da5ad4403b88f5def9a684e36 /miner/miner.go
parent7d69679935ff8c04aebb60f27074f08c5e84ac95 (diff)
parent8fe01b4bfa28ad5a1fdde7f9837e8f982843389a (diff)
downloadgo-tangerine-0.9.20.tar
go-tangerine-0.9.20.tar.gz
go-tangerine-0.9.20.tar.bz2
go-tangerine-0.9.20.tar.lz
go-tangerine-0.9.20.tar.xz
go-tangerine-0.9.20.tar.zst
go-tangerine-0.9.20.zip
Merge branch 'release/0.9.20'v0.9.20
Diffstat (limited to 'miner/miner.go')
-rw-r--r--miner/miner.go35
1 files changed, 19 insertions, 16 deletions
diff --git a/miner/miner.go b/miner/miner.go
index d5ea9a146..09342e250 100644
--- a/miner/miner.go
+++ b/miner/miner.go
@@ -7,6 +7,8 @@ import (
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/logger"
+ "github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/pow"
)
@@ -21,16 +23,8 @@ type Miner struct {
pow pow.PoW
}
-func New(eth core.Backend, pow pow.PoW, minerThreads int) *Miner {
- // note: minerThreads is currently ignored because
- // ethash is not thread safe.
- miner := &Miner{eth: eth, pow: pow, worker: newWorker(common.Address{}, eth)}
- for i := 0; i < minerThreads; i++ {
- miner.worker.register(NewCpuMiner(i, pow))
- }
- miner.threads = minerThreads
-
- return miner
+func New(eth core.Backend, pow pow.PoW) *Miner {
+ return &Miner{eth: eth, pow: pow, worker: newWorker(common.Address{}, eth)}
}
func (self *Miner) Mining() bool {
@@ -46,13 +40,27 @@ func (m *Miner) SetGasPrice(price *big.Int) {
m.worker.gasPrice = price
}
-func (self *Miner) Start(coinbase common.Address) {
+func (self *Miner) Start(coinbase common.Address, threads int) {
+
self.mining = true
+
+ for i := 0; i < threads; i++ {
+ self.worker.register(NewCpuAgent(i, self.pow))
+ }
+ self.threads = threads
+
+ glog.V(logger.Info).Infof("Starting mining operation (CPU=%d TOT=%d)\n", threads, len(self.worker.agents))
+
self.worker.coinbase = coinbase
self.worker.start()
self.worker.commitNewWork()
}
+func (self *Miner) Stop() {
+ self.worker.stop()
+ self.mining = false
+}
+
func (self *Miner) Register(agent Agent) {
if self.mining {
agent.Start()
@@ -61,11 +69,6 @@ func (self *Miner) Register(agent Agent) {
self.worker.register(agent)
}
-func (self *Miner) Stop() {
- self.mining = false
- self.worker.stop()
-}
-
func (self *Miner) HashRate() int64 {
return self.worker.HashRate()
}