From a2806ae8233039fa5c6ca7de44da11c8fd5d3478 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Thu, 17 Nov 2022 09:38:20 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E5=9D=97=E6=95=B0=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/box.go | 4 ++-- kernel/treenode/blocktree.go | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/kernel/model/box.go b/kernel/model/box.go index f37a44878..0da197d69 100644 --- a/kernel/model/box.go +++ b/kernel/model/box.go @@ -68,9 +68,9 @@ func autoStat() { defer statLock.Unlock() Conf.Stat.TreeCount = treenode.CountTrees() - Conf.Stat.CTreeCount = treenode.CeilCount(Conf.Stat.TreeCount) + Conf.Stat.CTreeCount = treenode.CeilTreeCount(Conf.Stat.TreeCount) Conf.Stat.BlockCount = treenode.CountBlocks() - Conf.Stat.CBlockCount = treenode.CeilCount(Conf.Stat.BlockCount) + Conf.Stat.CBlockCount = treenode.CeilBlockCount(Conf.Stat.BlockCount) Conf.Stat.DataSize, Conf.Stat.AssetsSize = util.DataSize() Conf.Stat.CDataSize = util.CeilSize(Conf.Stat.DataSize) Conf.Stat.CAssetsSize = util.CeilSize(Conf.Stat.AssetsSize) diff --git a/kernel/treenode/blocktree.go b/kernel/treenode/blocktree.go index b79754cb3..0b856fbd4 100644 --- a/kernel/treenode/blocktree.go +++ b/kernel/treenode/blocktree.go @@ -71,7 +71,7 @@ func CountBlocks() (ret int) { return len(blockTrees) } -func CeilCount(count int) int { +func CeilTreeCount(count int) int { if 100 > count { return 100 } @@ -84,6 +84,19 @@ func CeilCount(count int) int { return 500*40 + 1 } +func CeilBlockCount(count int) int { + if 5000 > count { + return 5000 + } + + for i := 1; i < 100; i++ { + if count < i*10000 { + return i * 10000 + } + } + return 10000*100 + 1 +} + func GetBlockTreeRootByPath(boxID, path string) *BlockTree { blockTreesLock.Lock() defer blockTreesLock.Unlock()