From 014543ac56e5ed54c901600438697e118a0aafe5 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 15 Jul 2022 23:51:04 -0600 Subject: cache? --- .../btrfsinspect/scanforextents/scanforextents.go | 43 +++++++++++++++++++++- 1 file changed, 41 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/btrfsprogs/btrfsinspect/scanforextents/scanforextents.go b/lib/btrfsprogs/btrfsinspect/scanforextents/scanforextents.go index 39113d8..5e7792e 100644 --- a/lib/btrfsprogs/btrfsinspect/scanforextents/scanforextents.go +++ b/lib/btrfsprogs/btrfsinspect/scanforextents/scanforextents.go @@ -69,6 +69,16 @@ func ScanForExtents(ctx context.Context, fs *btrfs.FS, blockGroups *BlockGroupTr return nil } +type csumCacheEntry struct { + Sum shortSum + Err error +} + +type csumCachePhysKey struct { + Dev *btrfs.Device + Addr btrfsvol.PhysicalAddr +} + type ExtentMappings struct { // input InFS btrfs.Trees @@ -83,6 +93,9 @@ type ExtentMappings struct { internedMappingsMu sync.Mutex internedMappings map[btrfsvol.Mapping]*btrfsvol.Mapping + cacheLogical containers.LRUCache[btrfsvol.LogicalAddr, csumCacheEntry] + cachePhysical containers.LRUCache[csumCachePhysKey, csumCacheEntry] + // output sum2lock map[shortSum]*sync.Mutex OutSum2mappings map[shortSum][]*btrfsvol.Mapping @@ -106,6 +119,32 @@ func (em *ExtentMappings) init() error { return em.initErr } +func (em *ExtentMappings) logicalSum(laddr btrfsvol.LogicalAddr) (shortSum, error) { + entry, ok := em.cacheLogical.Get(laddr) + if !ok { + sum, err := LookupCSum(em.InFS, em.alg, laddr) + entry.Sum = shortSum(sum[:em.alg.Size()]) + entry.Err = err + em.cacheLogical.Add(laddr, entry) + } + return entry.Sum, entry.Err +} + +func (em *ExtentMappings) physicalSum(dev *btrfs.Device, paddr btrfsvol.PhysicalAddr) (shortSum, error) { + key := csumCachePhysKey{ + Dev: dev, + Addr: paddr, + } + entry, ok := em.cachePhysical.Get(key) + if !ok { + sum, err := ChecksumPhysical(dev, em.alg, paddr) + entry.Sum = shortSum(sum[:em.alg.Size()]) + entry.Err = err + em.cachePhysical.Add(key, entry) + } + return entry.Sum, entry.Err +} + func (em *ExtentMappings) considerMapping(ctx context.Context, dev *btrfs.Device, laddr btrfsvol.LogicalAddr, paddr btrfsvol.QualifiedPhysicalAddr) (btrfsvol.Mapping, bool) { blockgroup := LookupBlockGroup(em.InBlockGroups, laddr, csumBlockSize) if blockgroup == nil { @@ -136,14 +175,14 @@ func (em *ExtentMappings) considerMapping(ctx context.Context, dev *btrfs.Device if err := ctx.Err(); err != nil { return btrfsvol.Mapping{}, false } - expCSum, err := LookupCSum(em.InFS, em.alg, mapping.LAddr.Add(offset)) + expCSum, err := em.logicalSum(mapping.LAddr.Add(offset)) if err != nil { continue } if err := ctx.Err(); err != nil { return btrfsvol.Mapping{}, false } - actCSum, err := ChecksumPhysical(dev, em.alg, mapping.PAddr.Addr.Add(offset)) + actCSum, err := em.physicalSum(dev, mapping.PAddr.Addr.Add(offset)) if err != nil { return btrfsvol.Mapping{}, false } -- cgit v1.2.3-2-g168b