From a3267ed9296b08ec170b239e519cb5aff6ee25f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Mon, 11 Jun 2018 14:32:13 +0300 Subject: [PATCH] trie: don't report the root flushlist as an alloc --- trie/database.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trie/database.go b/trie/database.go index 76a6cf79db..468c139df4 100644 --- a/trie/database.go +++ b/trie/database.go @@ -297,7 +297,7 @@ func (db *Database) Cap(limit common.StorageSize) error { // db.nodesSize only contains the useful data in the cache, but when reporting // 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. - size := db.nodesSize + common.StorageSize(len(db.nodes)*2*common.HashLength) + size := db.nodesSize + common.StorageSize((len(db.nodes)-1)*2*common.HashLength) // If the preimage cache got large enough, push to disk. If it's still small // leave for later to deduplicate writes. @@ -512,6 +512,6 @@ func (db *Database) Size() (common.StorageSize, common.StorageSize) { // db.nodesSize only contains the useful data in the cache, but when reporting // 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. - var flushlistSize = common.StorageSize(len(db.nodes) * 2 * common.HashLength) + var flushlistSize = common.StorageSize((len(db.nodes) - 1) * 2 * common.HashLength) return db.nodesSize + flushlistSize, db.preimagesSize }