forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move WithTimer function (#908)

Browse source 
move `WithTimer` method
This commit is contained in:
HAOYUatHZ 2024-07-18 10:41:06 +08:00 committed by GitHub
parent ac2f573c4f
commit 9e8b3f48e5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common/timer.go Normal file
View file

@ -0,0 +1,12 @@
package common
import "github.com/ethereum/go-ethereum/metrics"
// WithTimer calculates the interval of f
func WithTimer(timer metrics.Timer, f func()) {
if metrics.Enabled {
timer.Time(f)
} else {
f()
}
}

22
miner/worker.go
View file

@ -967,12 +967,12 @@ func (w *worker) applyTransaction(env *environment, tx *types.Transaction) (*typ
// 2.1 when starting handling the first tx, `state.refund` is 0 by default, // 2.1 when starting handling the first tx, `state.refund` is 0 by default,
// 2.2 after tracing, the state is either committed in `core.ApplyTransaction`, or reverted, so the `state.refund` can be cleared, // 2.2 after tracing, the state is either committed in `core.ApplyTransaction`, or reverted, so the `state.refund` can be cleared,
// 2.3 when starting handling the following txs, `state.refund` comes as 0 // 2.3 when starting handling the following txs, `state.refund` comes as 0
withTimer(l2CommitTxTraceTimer, func() { common.WithTimer(l2CommitTxTraceTimer, func() {
traces, err = env.traceEnv.GetBlockTrace( traces, err = env.traceEnv.GetBlockTrace(
types.NewBlockWithHeader(env.header).WithBody([]*types.Transaction{tx}, nil), types.NewBlockWithHeader(env.header).WithBody([]*types.Transaction{tx}, nil),
) )
}) })
withTimer(l2CommitTxTraceStateRevertTimer, func() { common.WithTimer(l2CommitTxTraceStateRevertTimer, func() {
// `env.traceEnv.State` & `env.state` share a same pointer to the state, so only need to revert `env.state` // `env.traceEnv.State` & `env.state` share a same pointer to the state, so only need to revert `env.state`
// revert to snapshot for calling `core.ApplyMessage` again, (both `traceEnv.GetBlockTrace` & `core.ApplyTransaction` will call `core.ApplyMessage`) // revert to snapshot for calling `core.ApplyMessage` again, (both `traceEnv.GetBlockTrace` & `core.ApplyTransaction` will call `core.ApplyMessage`)
env.state.RevertToSnapshot(snap) env.state.RevertToSnapshot(snap)
@ -980,7 +980,7 @@ func (w *worker) applyTransaction(env *environment, tx *types.Transaction) (*typ
if err != nil { if err != nil {
return nil, nil, nil, err return nil, nil, nil, err
} }
withTimer(l2CommitTxCCCTimer, func() { common.WithTimer(l2CommitTxCCCTimer, func() {
accRows, err = w.circuitCapacityChecker.ApplyTransaction(traces) accRows, err = w.circuitCapacityChecker.ApplyTransaction(traces)
}) })
if err != nil { if err != nil {
@ -998,7 +998,7 @@ func (w *worker) applyTransaction(env *environment, tx *types.Transaction) (*typ
snap = env.state.Snapshot() // create new snapshot for `core.ApplyTransaction` snap = env.state.Snapshot() // create new snapshot for `core.ApplyTransaction`
gp = env.gasPool.Gas() gp = env.gasPool.Gas()
) )
withTimer(l2CommitTxApplyTimer, func() { common.WithTimer(l2CommitTxApplyTimer, func() {
receipt, err = core.ApplyTransaction(w.chainConfig, w.chain, &env.coinbase, env.gasPool, env.state, env.header, tx, &env.header.GasUsed, *w.chain.GetVMConfig()) receipt, err = core.ApplyTransaction(w.chainConfig, w.chain, &env.coinbase, env.gasPool, env.state, env.header, tx, &env.header.GasUsed, *w.chain.GetVMConfig())
}) })
if err != nil { if err != nil {
@ -1429,7 +1429,7 @@ func (w *worker) fillTransactions(interrupt *atomic.Int32, env *environment) err
// fetch l1Txs // fetch l1Txs
var l1Messages []types.L1MessageTx var l1Messages []types.L1MessageTx
if w.chainConfig.Scroll.ShouldIncludeL1Messages() { if w.chainConfig.Scroll.ShouldIncludeL1Messages() {
withTimer(l2CommitNewWorkL1CollectTimer, func() { common.WithTimer(l2CommitNewWorkL1CollectTimer, func() {
l1Messages = w.collectPendingL1Messages(env.nextL1MsgIndex) l1Messages = w.collectPendingL1Messages(env.nextL1MsgIndex)
}) })
} }
@ -1634,7 +1634,7 @@ func (w *worker) calcAndSetAccRowsForEnv(env *environment) error {
) )
var traces *types.BlockTrace var traces *types.BlockTrace
var err error var err error
withTimer(l2CommitTraceTimer, func() { common.WithTimer(l2CommitTraceTimer, func() {
traces, err = env.traceEnv.GetBlockTrace(types.NewBlockWithHeader(env.header)) traces, err = env.traceEnv.GetBlockTrace(types.NewBlockWithHeader(env.header))
}) })
if err != nil { if err != nil {
@ -1650,7 +1650,7 @@ func (w *worker) calcAndSetAccRowsForEnv(env *environment) error {
traces.ExecutionResults = traces.ExecutionResults[:0] traces.ExecutionResults = traces.ExecutionResults[:0]
traces.TxStorageTraces = traces.TxStorageTraces[:0] traces.TxStorageTraces = traces.TxStorageTraces[:0]
var accRows *types.RowConsumption var accRows *types.RowConsumption
withTimer(l2CommitCCCTimer, func() { common.WithTimer(l2CommitCCCTimer, func() {
accRows, err = w.circuitCapacityChecker.ApplyBlock(traces) accRows, err = w.circuitCapacityChecker.ApplyBlock(traces)
}) })
if err != nil { if err != nil {
@ -1788,11 +1788,3 @@ func signalToErr(signal int32) error {
panic(fmt.Errorf("undefined signal %d", signal)) panic(fmt.Errorf("undefined signal %d", signal))
} }
} }
func withTimer(timer metrics.Timer, f func()) {
if metrics.Enabled {
timer.Time(f)
} else {
f()
}
}