forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-17 18:30:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

trie: move locking into trieDB insert method #25030 (#1091)

Browse source 
Move locking into trieDB insert function

Co-authored-by: aaronbuchwald <aaron.buchwald56@gmail.com>
This commit is contained in:
Daniel Liu 2025-08-22 16:38:30 +08:00 committed by GitHub
parent d52bfaa5ca
commit 793293f041
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
trie/committer.go
View file

@ -193,9 +193,7 @@ func (c *committer) store(n node, db *Database) node {
} else if db != nil { } else if db != nil {
// No leaf-callback used, but there's still a database. Do serial // No leaf-callback used, but there's still a database. Do serial
// insertion // insertion
db.Lock.Lock()
db.insert(common.BytesToHash(hash), size, n) db.insert(common.BytesToHash(hash), size, n)
db.Lock.Unlock()
} }
return hash return hash
} }
@ -208,10 +206,8 @@ func (c *committer) commitLoop(db *Database) {
size = item.size size = item.size
n = item.node n = item.node
) )
// We are pooling the trie nodes into an intermediate memory Cache // We are pooling the trie nodes into an intermediate memory cache
db.Lock.Lock()
db.insert(hash, size, n) db.insert(hash, size, n)
db.Lock.Unlock()
if c.onleaf != nil { if c.onleaf != nil {
switch n := n.(type) { switch n := n.(type) {

5
trie/database.go
View file

@ -304,7 +304,10 @@ func (db *Database) DiskDB() ethdb.KeyValueStore {
// All nodes inserted by this function will be reference tracked // All nodes inserted by this function will be reference tracked
// and in theory should only used for **trie nodes** insertion. // and in theory should only used for **trie nodes** insertion.
func (db *Database) insert(hash common.Hash, size int, node node) { func (db *Database) insert(hash common.Hash, size int, node node) {
// If the Node's already cached, skip db.Lock.Lock()
defer db.Lock.Unlock()
// If the node's already cached, skip
if _, ok := db.dirties[hash]; ok { if _, ok := db.dirties[hash]; ok {
return return
} }