forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-16 17:03:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

trie: thread out only on topmost fullnode

Browse source
This commit is contained in:
rjl493456442 2017-10-13 18:39:53 +08:00 committed by Péter Szilágyi
parent 475aa30a47
commit b21ff51e50
No known key found for this signature in database
GPG key ID: E9AE538CEDF8293D
1 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
trie/hasher.go
View file

@ -28,6 +28,7 @@ import (
type hasher struct {
cachegen, cachelimit uint16
threaded bool
mu sync.Mutex
}
@ -136,22 +137,40 @@ func (h *hasher) hashChildren(original node, db DatabaseWriter) (node, node, err
// Hash the full node's children, caching the newly hashed subtrees
var wg sync.WaitGroup
collapsed, cached := n.copy(), n.copy()
for i := 0; i < 16; i++ {
if n.Children[i] != nil {
wg.Add(1)
go func(i int) {
if !h.threaded {
// Calculate children hash concurrently.
// Note. Avoid creating too much goroutines(which may hits GC),
// we only thread out on the topmost full node.
for i := 0; i < 16; i++ {
if n.Children[i] != nil {
wg.Add(1)
go func(i int) {
var herr error
collapsed.Children[i], cached.Children[i], herr = h.hash(n.Children[i], db, false)
if herr != nil {
err = herr
}
wg.Done()
}(i)
} else {
collapsed.Children[i] = valueNode(nil) // Ensure that nil children are encoded as empty strings.
}
}
wg.Wait()
h.threaded = true
} else {
for i := 0; i < 16; i++ {
if n.Children[i] != nil {
var herr error
collapsed.Children[i], cached.Children[i], herr = h.hash(n.Children[i], db, false)
if herr != nil {
err = herr
}
wg.Done()
}(i)
} else {
collapsed.Children[i] = valueNode(nil) // Ensure that nil children are encoded as empty strings.
} else {
collapsed.Children[i] = valueNode(nil) // Ensure that nil children are encoded as empty strings.
}
}
}
wg.Wait()
if err != nil {
return original, original, err
}