core/state: fix read-meters + simplify code #24304
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I noticed that our meters are still not quite 100%.
I think the fault lies on the
s.SnapshotAccountReads
handling. TheSnapshotStorageReads/StorageReads
were seemingly correct, because they did this litlte dance with pointers, to ensure that the final defer-method would update the correct counter, which theSnapshotAccountReads/AccountReads
was missing.When looking into it a bit, I found that it could be simplified. This slightly changes the semantics of the timer -- the timer measurement in this PR covers only the pure lookup from snapshot/trie, not the time for rlp decoding and other paths -- the time for that will wind up on the
execution
timer. I don't think either approach is more correct than the other, but it does simplify the code to do it like this. The alternative would be to add the same complex pointer-dance to the AccountReads handling.