mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-25 06:06:44 +00:00
trie: reduce allocations in hashFullNodeChildren
temporary children array espaces to heap. Directly hash into a fullNode instead.
This commit is contained in:
parent
e94123acc2
commit
ee02c0a277
1 changed files with 7 additions and 7 deletions
|
|
@ -102,7 +102,7 @@ func (h *hasher) hashShortNodeChildren(n *shortNode) *shortNode {
|
||||||
// hashFullNodeChildren returns a copy of the supplied fullNode, with its child
|
// hashFullNodeChildren returns a copy of the supplied fullNode, with its child
|
||||||
// being replaced by either the hash or an embedded node if the child is small.
|
// being replaced by either the hash or an embedded node if the child is small.
|
||||||
func (h *hasher) hashFullNodeChildren(n *fullNode) *fullNode {
|
func (h *hasher) hashFullNodeChildren(n *fullNode) *fullNode {
|
||||||
var children [17]node
|
fullNode := fullNode{flags: nodeFlag{}}
|
||||||
if h.parallel {
|
if h.parallel {
|
||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
wg.Add(16)
|
wg.Add(16)
|
||||||
|
|
@ -110,9 +110,9 @@ func (h *hasher) hashFullNodeChildren(n *fullNode) *fullNode {
|
||||||
go func(i int) {
|
go func(i int) {
|
||||||
hasher := newHasher(false)
|
hasher := newHasher(false)
|
||||||
if child := n.Children[i]; child != nil {
|
if child := n.Children[i]; child != nil {
|
||||||
children[i] = hasher.hash(child, false)
|
fullNode.Children[i] = hasher.hash(child, false)
|
||||||
} else {
|
} else {
|
||||||
children[i] = nilValueNode
|
fullNode.Children[i] = nilValueNode
|
||||||
}
|
}
|
||||||
returnHasherToPool(hasher)
|
returnHasherToPool(hasher)
|
||||||
wg.Done()
|
wg.Done()
|
||||||
|
|
@ -122,16 +122,16 @@ func (h *hasher) hashFullNodeChildren(n *fullNode) *fullNode {
|
||||||
} else {
|
} else {
|
||||||
for i := 0; i < 16; i++ {
|
for i := 0; i < 16; i++ {
|
||||||
if child := n.Children[i]; child != nil {
|
if child := n.Children[i]; child != nil {
|
||||||
children[i] = h.hash(child, false)
|
fullNode.Children[i] = h.hash(child, false)
|
||||||
} else {
|
} else {
|
||||||
children[i] = nilValueNode
|
fullNode.Children[i] = nilValueNode
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if n.Children[16] != nil {
|
if n.Children[16] != nil {
|
||||||
children[16] = n.Children[16]
|
fullNode.Children[16] = n.Children[16]
|
||||||
}
|
}
|
||||||
return &fullNode{flags: nodeFlag{}, Children: children}
|
return &fullNode
|
||||||
}
|
}
|
||||||
|
|
||||||
// shortNodeToHash computes the hash of the given shortNode. The shortNode must
|
// shortNodeToHash computes the hash of the given shortNode. The shortNode must
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue