Skip to content

Commit

Permalink
Fix pipecommit about activeState (#1002)
Browse files Browse the repository at this point in the history
* get copy of prefetcher before use to avoid been modified between access and not-nil condition
  • Loading branch information
qinglin89 authored Jul 26, 2022
1 parent 71f0caa commit a2a90d3
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 10 deletions.
16 changes: 10 additions & 6 deletions core/state/state_object.go
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,11 @@ func (s *StateObject) getTrie(db Database) Trie {
if s.trie == nil {
// Try fetching from prefetcher first
// We don't prefetch empty tries
if s.data.Root != emptyRoot && s.db.prefetcher != nil {
prefetcher := s.db.prefetcher
if s.data.Root != emptyRoot && prefetcher != nil {
// When the miner is creating the pending state, there is no
// prefetcher
s.trie = s.db.prefetcher.trie(s.data.Root)
s.trie = prefetcher.trie(s.data.Root)
}
if s.trie == nil {
var err error
Expand Down Expand Up @@ -375,8 +376,9 @@ func (s *StateObject) finalise(prefetch bool) {
}
}

if s.db.prefetcher != nil && prefetch && len(slotsToPrefetch) > 0 && s.data.Root != emptyRoot && s.data.Root != dummyRoot {
s.db.prefetcher.prefetch(s.data.Root, slotsToPrefetch, s.addrHash)
prefetcher := s.db.prefetcher
if prefetcher != nil && prefetch && len(slotsToPrefetch) > 0 && s.data.Root != emptyRoot && s.data.Root != dummyRoot {
prefetcher.prefetch(s.data.Root, slotsToPrefetch, s.addrHash)
}
if len(s.dirtyStorage) > 0 {
s.dirtyStorage = make(Storage)
Expand Down Expand Up @@ -450,9 +452,11 @@ func (s *StateObject) updateTrie(db Database) Trie {
}
wg.Wait()

if s.db.prefetcher != nil {
s.db.prefetcher.used(s.data.Root, usedStorage)
prefetcher := s.db.prefetcher
if prefetcher != nil {
prefetcher.used(s.data.Root, usedStorage)
}

if len(s.pendingStorage) > 0 {
s.pendingStorage = make(Storage)
}
Expand Down
10 changes: 6 additions & 4 deletions core/state/statedb.go
Original file line number Diff line number Diff line change
Expand Up @@ -857,8 +857,9 @@ func (s *StateDB) Copy() *StateDB {
// If there's a prefetcher running, make an inactive copy of it that can
// only access data but does not actively preload (since the user will not
// know that they need to explicitly terminate an active copy).
if s.prefetcher != nil {
state.prefetcher = s.prefetcher.copy()
prefetcher := s.prefetcher
if prefetcher != nil {
state.prefetcher = prefetcher.copy()
}
if s.snaps != nil {
// In order for the miner to be able to use and make additions
Expand Down Expand Up @@ -970,8 +971,9 @@ func (s *StateDB) Finalise(deleteEmptyObjects bool) {
addressesToPrefetch = append(addressesToPrefetch, common.CopyBytes(addr[:])) // Copy needed for closure
}
}
if s.prefetcher != nil && len(addressesToPrefetch) > 0 {
s.prefetcher.prefetch(s.originalRoot, addressesToPrefetch, emptyAddr)
prefetcher := s.prefetcher
if prefetcher != nil && len(addressesToPrefetch) > 0 {
prefetcher.prefetch(s.originalRoot, addressesToPrefetch, emptyAddr)
}
// Invalidate journal because reverting across transactions is not allowed.
s.clearJournalAndRefund()
Expand Down

0 comments on commit a2a90d3

Please sign in to comment.