forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-22 20:56:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

core: remove accountHashWait

Browse source
This commit is contained in:
Gary Rong 2025-10-17 14:00:27 +08:00
parent 97b516bb89
commit df53e28fcd
3 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/blockchain.go
View file

@ -2158,7 +2158,6 @@ func (bc *BlockChain) ProcessBlock(parentRoot common.Hash, block *types.Block, s
stats.AccountReads = statedb.AccountReads // Account reads are complete(in processing) stats.AccountReads = statedb.AccountReads // Account reads are complete(in processing)
stats.StorageReads = statedb.StorageReads // Storage reads are complete(in processing) stats.StorageReads = statedb.StorageReads // Storage reads are complete(in processing)
stats.AccountUpdates = statedb.AccountUpdates // Account updates are complete(in validation) stats.AccountUpdates = statedb.AccountUpdates // Account updates are complete(in validation)
stats.AccountUpdateWait = statedb.AccountUpdateWait
stats.StorageUpdates = statedb.StorageUpdates // Storage updates are complete(in validation) stats.StorageUpdates = statedb.StorageUpdates // Storage updates are complete(in validation)
stats.AccountHashes = statedb.AccountHashes // Account hashes are complete(in validation) stats.AccountHashes = statedb.AccountHashes // Account hashes are complete(in validation)

19
core/blockchain_stats.go
View file

@ -30,14 +30,13 @@ import (
// ExecuteStats includes all the statistics of a block execution in details. // ExecuteStats includes all the statistics of a block execution in details.
type ExecuteStats struct { type ExecuteStats struct {
// State read times // State read times
AccountReads time.Duration // Time spent on the account reads AccountReads time.Duration // Time spent on the account reads
StorageReads time.Duration // Time spent on the storage reads StorageReads time.Duration // Time spent on the storage reads
AccountHashes time.Duration // Time spent on the account trie hash AccountHashes time.Duration // Time spent on the account trie hash
AccountUpdates time.Duration // Time spent on the account trie update AccountUpdates time.Duration // Time spent on the account trie update
AccountUpdateWait time.Duration // Time spent on waiting the account trie from prefetching AccountCommits time.Duration // Time spent on the account trie commit
AccountCommits time.Duration // Time spent on the account trie commit StorageUpdates time.Duration // Time spent on the storage trie update
StorageUpdates time.Duration // Time spent on the storage trie update StorageCommits time.Duration // Time spent on the storage trie commit
StorageCommits time.Duration // Time spent on the storage trie commit
AccountLoaded int // Number of accounts loaded AccountLoaded int // Number of accounts loaded
AccountUpdated int // Number of accounts updated AccountUpdated int // Number of accounts updated
@ -115,7 +114,7 @@ EVM execution: %v
Validation: %v Validation: %v
Account read: %v(%d) Account read: %v(%d)
Storage read: %v(%d) Storage read: %v(%d)
Account hash: %v(wait=%v) Account hash: %v
Storage hash: %v Storage hash: %v
DB commit: %v DB commit: %v
Block write: %v Block write: %v
@ -127,7 +126,7 @@ Total: %v
common.PrettyDuration(s.Execution), common.PrettyDuration(s.Validation+s.CrossValidation), common.PrettyDuration(s.Execution), common.PrettyDuration(s.Validation+s.CrossValidation),
common.PrettyDuration(s.AccountReads), s.AccountLoaded, common.PrettyDuration(s.AccountReads), s.AccountLoaded,
common.PrettyDuration(s.StorageReads), s.StorageLoaded, common.PrettyDuration(s.StorageReads), s.StorageLoaded,
common.PrettyDuration(s.AccountHashes+s.AccountCommits+s.AccountUpdates), common.PrettyDuration(s.AccountUpdateWait), common.PrettyDuration(s.AccountHashes+s.AccountCommits+s.AccountUpdates),
common.PrettyDuration(s.StorageCommits+s.StorageUpdates), common.PrettyDuration(s.StorageCommits+s.StorageUpdates),
common.PrettyDuration(s.TrieDBCommit+s.SnapshotCommit), common.PrettyDuration(s.BlockWrite), common.PrettyDuration(s.TrieDBCommit+s.SnapshotCommit), common.PrettyDuration(s.BlockWrite),
common.PrettyDuration(s.TotalTime), s.StateReadCacheStats) common.PrettyDuration(s.TotalTime), s.StateReadCacheStats)

10
core/state/statedb.go
View file

@ -140,11 +140,10 @@ type StateDB struct {
witnessStats *stateless.WitnessStats witnessStats *stateless.WitnessStats
// Measurements gathered during execution for debugging purposes // Measurements gathered during execution for debugging purposes
AccountReads time.Duration AccountReads time.Duration
AccountHashes time.Duration AccountHashes time.Duration
AccountUpdates time.Duration AccountUpdates time.Duration
AccountCommits time.Duration AccountCommits time.Duration
AccountUpdateWait time.Duration
StorageReads time.Duration StorageReads time.Duration
StorageUpdates time.Duration StorageUpdates time.Duration
@ -917,7 +916,6 @@ func (s *StateDB) IntermediateRoot(deleteEmptyObjects bool) common.Hash {
} else { } else {
s.trie = trie s.trie = trie
} }
s.AccountUpdateWait += time.Since(start)
} }
// Perform updates before deletions. This prevents resolution of unnecessary trie nodes // Perform updates before deletions. This prevents resolution of unnecessary trie nodes
// in circumstances similar to the following: // in circumstances similar to the following: