Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

txdag: opt generation performance; #156

Merged
merged 1 commit into from
Aug 29, 2024
Merged

txdag: opt generation performance; #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions core/state/state_object.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,17 +306,17 @@ func (s *stateObject) finaliseRWSet() {
if value == s.GetCommittedState(key) {
continue
}
s.db.RecordWrite(types.StorageStateKey(s.address, key), value)
s.db.RecordStorageWrite(s.address, key, value)
}

if s.dirtyNonce != nil && *s.dirtyNonce != s.data.Nonce {
s.db.RecordWrite(types.AccountStateKey(s.address, types.AccountNonce), *s.dirtyNonce)
s.db.RecordAccountWrite(s.address, types.AccountNonce, *s.dirtyNonce)
}
if s.dirtyBalance != nil && s.dirtyBalance.Cmp(s.data.Balance) != 0 {
s.db.RecordWrite(types.AccountStateKey(s.address, types.AccountBalance), new(big.Int).Set(s.dirtyBalance))
s.db.RecordAccountWrite(s.address, types.AccountBalance, new(big.Int).Set(s.dirtyBalance))
}
if s.dirtyCodeHash != nil && !slices.Equal(s.dirtyCodeHash, s.data.CodeHash) {
s.db.RecordWrite(types.AccountStateKey(s.address, types.AccountCodeHash), s.dirtyCodeHash)
s.db.RecordAccountWrite(s.address, types.AccountCodeHash, s.dirtyCodeHash)
}
}

Expand Down
65 changes: 42 additions & 23 deletions core/state/statedb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ func (s *StateDB) Empty(addr common.Address) bool {
// GetBalance retrieves the balance from the given address or 0 if object not found
func (s *StateDB) GetBalance(addr common.Address) (ret *big.Int) {
defer func() {
s.RecordRead(types.AccountStateKey(addr, types.AccountBalance), ret)
s.RecordAccountRead(addr, types.AccountBalance, ret)
}()

stateObject := s.getStateObject(addr)
Expand All @@ -361,7 +361,7 @@ func (s *StateDB) GetBalance(addr common.Address) (ret *big.Int) {
// GetNonce retrieves the nonce from the given address or 0 if object not found
func (s *StateDB) GetNonce(addr common.Address) (ret uint64) {
defer func() {
s.RecordRead(types.AccountStateKey(addr, types.AccountNonce), ret)
s.RecordAccountRead(addr, types.AccountNonce, ret)
}()
stateObject := s.getStateObject(addr)
if stateObject != nil {
Expand All @@ -388,7 +388,7 @@ func (s *StateDB) TxIndex() int {

func (s *StateDB) GetCode(addr common.Address) []byte {
defer func() {
s.RecordRead(types.AccountStateKey(addr, types.AccountCodeHash), s.GetCodeHash(addr))
s.RecordAccountRead(addr, types.AccountCodeHash, s.GetCodeHash(addr))
}()
stateObject := s.getStateObject(addr)
if stateObject != nil {
Expand All @@ -399,7 +399,7 @@ func (s *StateDB) GetCode(addr common.Address) []byte {

func (s *StateDB) GetCodeSize(addr common.Address) int {
defer func() {
s.RecordRead(types.AccountStateKey(addr, types.AccountCodeHash), s.GetCodeHash(addr))
s.RecordAccountRead(addr, types.AccountCodeHash, s.GetCodeHash(addr))
}()
stateObject := s.getStateObject(addr)
if stateObject != nil {
Expand All @@ -410,7 +410,7 @@ func (s *StateDB) GetCodeSize(addr common.Address) int {

func (s *StateDB) GetCodeHash(addr common.Address) (ret common.Hash) {
defer func() {
s.RecordRead(types.AccountStateKey(addr, types.AccountCodeHash), ret.Bytes())
s.RecordAccountRead(addr, types.AccountCodeHash, ret.Bytes())
}()
stateObject := s.getStateObject(addr)
if stateObject == nil {
Expand All @@ -422,7 +422,7 @@ func (s *StateDB) GetCodeHash(addr common.Address) (ret common.Hash) {
// GetState retrieves a value from the given account's storage trie.
func (s *StateDB) GetState(addr common.Address, hash common.Hash) (ret common.Hash) {
defer func() {
s.RecordRead(types.StorageStateKey(addr, hash), ret)
s.RecordStorageRead(addr, hash, ret)
}()
stateObject := s.getStateObject(addr)
if stateObject != nil {
Expand All @@ -434,7 +434,7 @@ func (s *StateDB) GetState(addr common.Address, hash common.Hash) (ret common.Ha
// GetCommittedState retrieves a value from the given account's committed storage trie.
func (s *StateDB) GetCommittedState(addr common.Address, hash common.Hash) (ret common.Hash) {
defer func() {
s.RecordRead(types.StorageStateKey(addr, hash), ret)
s.RecordStorageRead(addr, hash, ret)
}()
stateObject := s.getStateObject(addr)
if stateObject != nil {
Expand Down Expand Up @@ -464,22 +464,22 @@ func (s *StateDB) HasSelfDestructed(addr common.Address) bool {
func (s *StateDB) AddBalance(addr common.Address, amount *big.Int) {
stateObject := s.GetOrNewStateObject(addr)
if stateObject != nil {
s.RecordRead(types.AccountStateKey(addr, types.AccountBalance), stateObject.Balance())
s.RecordAccountRead(addr, types.AccountBalance, stateObject.Balance())
stateObject.AddBalance(amount)
return
}
s.RecordRead(types.AccountStateKey(addr, types.AccountBalance), common.Big0)
s.RecordAccountRead(addr, types.AccountBalance, common.Big0)
}

// SubBalance subtracts amount from the account associated with addr.
func (s *StateDB) SubBalance(addr common.Address, amount *big.Int) {
stateObject := s.GetOrNewStateObject(addr)
if stateObject != nil {
s.RecordRead(types.AccountStateKey(addr, types.AccountBalance), stateObject.Balance())
s.RecordAccountRead(addr, types.AccountBalance, stateObject.Balance())
stateObject.SubBalance(amount)
return
}
s.RecordRead(types.AccountStateKey(addr, types.AccountBalance), common.Big0)
s.RecordAccountRead(addr, types.AccountBalance, common.Big0)
}

func (s *StateDB) SetBalance(addr common.Address, amount *big.Int) {
Expand Down Expand Up @@ -659,7 +659,7 @@ func (s *StateDB) getStateObject(addr common.Address) *stateObject {
// flag set. This is needed by the state journal to revert to the correct s-
// destructed object instead of wiping all knowledge about the state object.
func (s *StateDB) getDeletedStateObject(addr common.Address) *stateObject {
s.RecordRead(types.AccountStateKey(addr, types.AccountSelf), struct{}{})
s.RecordAccountRead(addr, types.AccountSelf, struct{}{})
// Prefer live objects if any is available
if obj := s.stateObjects[addr]; obj != nil {
return obj
Expand Down Expand Up @@ -1720,32 +1720,49 @@ func (s *StateDB) StopTxStat(usedGas uint64) {
s.stat.Done().WithGas(usedGas)
rwSet := s.mvStates.RWSet(s.txIndex)
if rwSet != nil {
s.stat.WithRead(len(rwSet.ReadSet()))
ar, sr := rwSet.ReadSet()
s.stat.WithRead(len(ar) + len(sr))
}
}
}

func (s *StateDB) RecordRead(key types.RWKey, val interface{}) {
func (s *StateDB) RecordAccountRead(addr common.Address, state types.AccountState, val interface{}) {
if s.rwSet == nil {
return
}
s.rwSet.RecordRead(key, types.StateVersion{
s.rwSet.RecordAccountRead(addr, state, types.StateVersion{
TxIndex: -1,
}, val)
}

func (s *StateDB) RecordWrite(key types.RWKey, val interface{}) {
func (s *StateDB) RecordStorageRead(addr common.Address, slot common.Hash, val interface{}) {
if s.rwSet == nil {
return
}
s.rwSet.RecordWrite(key, val)
s.rwSet.RecordStorageRead(addr, slot, types.StateVersion{
TxIndex: -1,
}, val)
}

func (s *StateDB) RecordAccountWrite(addr common.Address, state types.AccountState, val interface{}) {
if s.rwSet == nil {
return
}
s.rwSet.RecordAccountWrite(addr, state, val)
}

func (s *StateDB) RecordStorageWrite(addr common.Address, slot common.Hash, val interface{}) {
if s.rwSet == nil {
return
}
s.rwSet.RecordStorageWrite(addr, slot, val)
}

func (s *StateDB) ResetMVStates(txCount int) {
if s.mvStates != nil {
s.mvStates.Stop()
}
s.mvStates = types.NewMVStates(txCount).EnableAsyncDepGen()
s.mvStates = types.NewMVStates(txCount).EnableAsyncGen()
s.rwSet = nil
}

Expand All @@ -1769,7 +1786,7 @@ func (s *StateDB) FinaliseRWSet() error {

// finalise stateObjectsDestruct
for addr := range s.stateObjectsDestructDirty {
s.RecordWrite(types.AccountStateKey(addr, types.AccountSuicide), struct{}{})
s.RecordAccountWrite(addr, types.AccountSuicide, struct{}{})
}
for addr := range s.journal.dirties {
obj, exist := s.stateObjects[addr]
Expand All @@ -1781,8 +1798,7 @@ func (s *StateDB) FinaliseRWSet() error {
// set indefinitely). Note only the first occurred self-destruct
// event is tracked.
if _, ok := s.stateObjectsDestruct[obj.address]; !ok {
log.Debug("FinaliseRWSet find Destruct", "tx", s.txIndex, "addr", addr, "selfDestructed", obj.selfDestructed)
s.RecordWrite(types.AccountStateKey(addr, types.AccountSuicide), struct{}{})
s.RecordAccountWrite(addr, types.AccountSuicide, struct{}{})
}
} else {
// finalise account & storages
Expand All @@ -1796,7 +1812,8 @@ func (s *StateDB) FinaliseRWSet() error {
return err
}
// just Finalise rwSet in serial execution
return s.mvStates.Finalise(s.txIndex)
s.mvStates.AsyncFinalise(s.txIndex)
return nil
}

func (s *StateDB) getStateObjectsDestruct(addr common.Address) (*types.StateAccount, bool) {
Expand Down Expand Up @@ -1847,7 +1864,9 @@ func (s *StateDB) RecordSystemTxRWSet(index int) {
s.mvStates.FulfillRWSet(types.NewRWSet(types.StateVersion{
TxIndex: index,
}).WithExcludedTxFlag(), types.NewExeStat(index).WithExcludedTxFlag())
s.mvStates.Finalise(index)
if err := s.mvStates.Finalise(index); err != nil {
log.Error("MVStates SystemTx Finalise err", "err", err)
}
}

// copySet returns a deep-copied set.
Expand Down
Loading
Loading