diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-09 22:22:54 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-09 22:22:54 +0800 |
| commit | cd6d703e94ec684bd8d0fd0ed231e99417887e8b (patch) | |
| tree | 189c321aac4adac1c7e628b71bd1dd64b6aa9a9c /eth | |
| parent | dd140beb73bf70d1b7c78c5a92e5c73586282bb6 (diff) | |
| parent | eb2d168710891f2cc9ef79fae7a128af70efadee (diff) | |
| download | dexon-cd6d703e94ec684bd8d0fd0ed231e99417887e8b.tar dexon-cd6d703e94ec684bd8d0fd0ed231e99417887e8b.tar.gz dexon-cd6d703e94ec684bd8d0fd0ed231e99417887e8b.tar.bz2 dexon-cd6d703e94ec684bd8d0fd0ed231e99417887e8b.tar.lz dexon-cd6d703e94ec684bd8d0fd0ed231e99417887e8b.tar.xz dexon-cd6d703e94ec684bd8d0fd0ed231e99417887e8b.tar.zst dexon-cd6d703e94ec684bd8d0fd0ed231e99417887e8b.zip | |
Merge pull request #1447 from karalabe/fix-database-metrics-race-3
eth, ethdb: fix a data race during startup/shutdown
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/backend.go | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/eth/backend.go b/eth/backend.go index 391a610e3..9c661ad54 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -41,7 +41,6 @@ import ( "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/metrics" "github.com/ethereum/go-ethereum/miner" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/discover" @@ -267,42 +266,21 @@ func New(config *Config) (*Ethereum, error) { return nil, fmt.Errorf("blockchain db err: %v", err) } if db, ok := blockDb.(*ethdb.LDBDatabase); ok { - db.GetTimer = metrics.NewTimer("eth/db/block/user/gets") - db.PutTimer = metrics.NewTimer("eth/db/block/user/puts") - db.MissMeter = metrics.NewMeter("eth/db/block/user/misses") - db.ReadMeter = metrics.NewMeter("eth/db/block/user/reads") - db.WriteMeter = metrics.NewMeter("eth/db/block/user/writes") - db.CompTimeMeter = metrics.NewMeter("eth/db/block/compact/time") - db.CompReadMeter = metrics.NewMeter("eth/db/block/compact/input") - db.CompWriteMeter = metrics.NewMeter("eth/db/block/compact/output") + db.Meter("eth/db/block/") } stateDb, err := newdb(filepath.Join(config.DataDir, "state")) if err != nil { return nil, fmt.Errorf("state db err: %v", err) } if db, ok := stateDb.(*ethdb.LDBDatabase); ok { - db.GetTimer = metrics.NewTimer("eth/db/state/user/gets") - db.PutTimer = metrics.NewTimer("eth/db/state/user/puts") - db.MissMeter = metrics.NewMeter("eth/db/state/user/misses") - db.ReadMeter = metrics.NewMeter("eth/db/state/user/reads") - db.WriteMeter = metrics.NewMeter("eth/db/state/user/writes") - db.CompTimeMeter = metrics.NewMeter("eth/db/state/compact/time") - db.CompReadMeter = metrics.NewMeter("eth/db/state/compact/input") - db.CompWriteMeter = metrics.NewMeter("eth/db/state/compact/output") + db.Meter("eth/db/state/") } extraDb, err := newdb(filepath.Join(config.DataDir, "extra")) if err != nil { return nil, fmt.Errorf("extra db err: %v", err) } if db, ok := extraDb.(*ethdb.LDBDatabase); ok { - db.GetTimer = metrics.NewTimer("eth/db/extra/user/gets") - db.PutTimer = metrics.NewTimer("eth/db/extra/user/puts") - db.MissMeter = metrics.NewMeter("eth/db/extra/user/misses") - db.ReadMeter = metrics.NewMeter("eth/db/extra/user/reads") - db.WriteMeter = metrics.NewMeter("eth/db/extra/user/writes") - db.CompTimeMeter = metrics.NewMeter("eth/db/extra/compact/time") - db.CompReadMeter = metrics.NewMeter("eth/db/extra/compact/input") - db.CompWriteMeter = metrics.NewMeter("eth/db/extra/compact/output") + db.Meter("eth/db/extra/") } nodeDb := filepath.Join(config.DataDir, "nodes") |