diff options
author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-02 21:06:08 +0800 |
---|---|---|
committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-02 21:06:08 +0800 |
commit | 4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8 (patch) | |
tree | 1cc4369855586a5b59406d09299e89f8e3f9142d /miner/worker.go | |
parent | cfe037028081ebb84ee35caa5b16fed5d125b58a (diff) | |
parent | 65cad14f9b27db396d036f47814d4843d947ac43 (diff) | |
download | go-tangerine-4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8.tar go-tangerine-4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8.tar.gz go-tangerine-4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8.tar.bz2 go-tangerine-4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8.tar.lz go-tangerine-4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8.tar.xz go-tangerine-4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8.tar.zst go-tangerine-4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8.zip |
Merge branch 'develop' of github.com:ethereum/go-ethereum into removews
Conflicts:
cmd/ethereum/flags.go
cmd/mist/flags.go
Diffstat (limited to 'miner/worker.go')
-rw-r--r-- | miner/worker.go | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/miner/worker.go b/miner/worker.go index 4f0909302..afce68c35 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -5,6 +5,7 @@ import ( "math/big" "sort" "sync" + "time" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" @@ -111,6 +112,8 @@ func (self *worker) register(agent Agent) { func (self *worker) update() { events := self.mux.Subscribe(core.ChainEvent{}, core.NewMinedBlockEvent{}) + timer := time.NewTicker(2 * time.Second) + out: for { select { @@ -129,6 +132,8 @@ out: agent.Stop() } break out + case <-timer.C: + minerlogger.Debugln("Hash rate:", self.HashRate(), "Khash") } } @@ -244,3 +249,12 @@ func (self *worker) commitTransaction(tx *types.Transaction) error { return nil } + +func (self *worker) HashRate() int64 { + var tot int64 + for _, agent := range self.agents { + tot += agent.Pow().GetHashrate() + } + + return tot +} |