gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core, eth, eth/fetcher, ethdb: polish metrics gathering a bit

Browse Source
This commit is contained in:
Péter Szilágyi
2015-06-23 13:03:33 +03:00
parent 6260b86c15
commit 792b0ddccd
4 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/chain_manager.go
View File

@ -13,7 +13,6 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog"
@ -31,10 +30,6 @@ var (
blockNumPre = []byte("block-num-")
blockInsertTimer = metrics.GetOrRegisterTimer("core/BlockInsertions", metrics.DefaultRegistry)
blockdbGetMeter = metrics.GetOrRegisterMeter("core/blockdb/Gets", metrics.DefaultRegistry)
blockdbPutMeter = metrics.GetOrRegisterMeter("core/blockdb/Puts", metrics.DefaultRegistry)
statedbGetMeter = metrics.GetOrRegisterMeter("core/statedb/Gets", metrics.DefaultRegistry)
statedbPutMeter = metrics.GetOrRegisterMeter("core/statedb/Puts", metrics.DefaultRegistry)
)
const (
@ -126,15 +121,6 @@ func NewChainManager(genesis *types.Block, blockDb, stateDb common.Database, pow
cache: NewBlockCache(blockCacheLimit),
pow: pow,
}
// Instrument the block and state databases
if db, ok := blockDb.(*ethdb.LDBDatabase); ok {
db.GetMeter = blockdbGetMeter
db.PutMeter = blockdbPutMeter
}
if db, ok := stateDb.(*ethdb.LDBDatabase); ok {
db.GetMeter = statedbGetMeter
db.PutMeter = statedbPutMeter
}
// Check the genesis block given to the chain manager. If the genesis block mismatches block number 0
// throw an error. If no block or the same block's found continue.
if g := bc.GetBlockByNumber(0); g != nil && g.Hash() != genesis.Hash() {