forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 18:32:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

trie: approximate the wasted cache metaspace closer

Browse source
This commit is contained in:
Péter Szilágyi 2018-11-22 14:09:04 +02:00
parent 2843001ac2
commit 6845265643
No known key found for this signature in database
GPG key ID: E9AE538CEDF8293D
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
trie/database.go
View file

@ -86,7 +86,7 @@ type Database struct {
flushnodes uint64 // Nodes flushed since last commit flushnodes uint64 // Nodes flushed since last commit
flushsize common.StorageSize // Data storage flushed since last commit flushsize common.StorageSize // Data storage flushed since last commit
dirtiesSize common.StorageSize // Storage size of the dirty node cache (exc. flushlist) dirtiesSize common.StorageSize // Storage size of the dirty node cache (exc. metadata)
preimagesSize common.StorageSize // Storage size of the preimages cache preimagesSize common.StorageSize // Storage size of the preimages cache
lock sync.RWMutex lock sync.RWMutex
@ -148,6 +148,16 @@ type cachedNode struct {
flushNext common.Hash // Next node in the flush-list flushNext common.Hash // Next node in the flush-list
} }
// cachedNodeSize is the raw size of a cachedNode data structure without any
// node data included. It's an approximate size, but should be a lot better
// than not counting them.
const cachedNodeSize = 0 +
8 + // node interface pointer
4 + // byte size of the cached data
8 + // number of referencing nodes
48 + // empty map of external children
2*common.HashLength // previous and next node in flushlist
// rlp returns the raw rlp encoded blob of the cached node, either directly from // rlp returns the raw rlp encoded blob of the cached node, either directly from
// the cache, or by regenerating it from the collapsed node. // the cache, or by regenerating it from the collapsed node.
func (n *cachedNode) rlp() []byte { func (n *cachedNode) rlp() []byte {
@ -569,8 +579,8 @@ func (db *Database) Cap(limit common.StorageSize) error {
// db.dirtiesSize only contains the useful data in the cache, but when reporting // db.dirtiesSize only contains the useful data in the cache, but when reporting
// the total memory consumption, the maintenance metadata is also needed to be // the total memory consumption, the maintenance metadata is also needed to be
// counted. For every useful node, we track 2 extra hashes as the flushlist. // counted.
size := db.dirtiesSize + common.StorageSize((len(db.dirties)-1)*2*common.HashLength) size := db.dirtiesSize + common.StorageSize((len(db.dirties)-1)*cachedNodeSize)
// If the preimage cache got large enough, push to disk. If it's still small // If the preimage cache got large enough, push to disk. If it's still small
// leave for later to deduplicate writes. // leave for later to deduplicate writes.
@ -789,9 +799,9 @@ func (db *Database) Size() (common.StorageSize, common.StorageSize) {
// db.dirtiesSize only contains the useful data in the cache, but when reporting // db.dirtiesSize only contains the useful data in the cache, but when reporting
// the total memory consumption, the maintenance metadata is also needed to be // the total memory consumption, the maintenance metadata is also needed to be
// counted. For every useful node, we track 2 extra hashes as the flushlist. // counted.
var flushlistSize = common.StorageSize((len(db.dirties) - 1) * 2 * common.HashLength) var metadataSize = common.StorageSize((len(db.dirties) - 1) * cachedNodeSize)
return db.dirtiesSize + flushlistSize, db.preimagesSize return db.dirtiesSize + metadataSize, db.preimagesSize
} }
// verifyIntegrity is a debug method to iterate over the entire trie stored in // verifyIntegrity is a debug method to iterate over the entire trie stored in