better output

3 files changed, 22 insertions, 73 deletions

diff --git a/cmd/btrfs-fsck/pass1.go b/cmd/btrfs-fsck/pass1.go
index a7c4a61..4ac69b0 100644
--- a/cmd/btrfs-fsck/pass1.go
+++ b/cmd/btrfs-fsck/pass1.go
@@ -8,6 +8,8 @@ import (
 	"os"
 	"sort"
 
+	"golang.org/x/text/message"
+
 	"lukeshu.com/btrfs-tools/pkg/btrfs"
 	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsitem"
 	"lukeshu.com/btrfs-tools/pkg/btrfs/btrfsvol"
@@ -46,8 +48,6 @@ func pass1(fs *btrfs.FS, superblock *util.Ref[btrfs.PhysicalAddr, btrfs.Superblo
 		fmt.Printf("Pass 1: ... dev[%q] re-inserting lost+found mappings\n", dev.Name())
 		devResult.AddToLV(fs, dev)
 
-		pass1ProcessBlockGroups(devResult.FoundBlockGroups)
-
 		// merge those results in to the total-fs results
 		for laddr := range devResult.FoundNodes {
 			fsFoundNodes[laddr] = struct{}{}
@@ -55,7 +55,7 @@ func pass1(fs *btrfs.FS, superblock *util.Ref[btrfs.PhysicalAddr, btrfs.Superblo
 	}
 
 	fmt.Printf("Pass 1: ... writing re-constructed chunks\n")
-	pass1PrintReconstructedChunks(fs)
+	pass1PrintLogicalSpace(fs)
 	//pass1WriteReconstructedChunks(fs, superblock.Data, fsReconstructedChunks)
 
 	return fsFoundNodes, nil
@@ -284,77 +284,17 @@ func pass1ScanOneDev_real(dev *btrfs.Device, superblock btrfs.Superblock) (pass1
 	return result, err
 }
 
-func pass1ProcessBlockGroups(blockgroups []sysBlockGroup) {
-	// organize in to a more manageable datastructure
-	type groupAttrs struct {
-		Size  btrfs.AddrDelta
-		Flags btrfsvol.BlockGroupFlags
-	}
-	groups := make(map[btrfs.LogicalAddr]groupAttrs)
-	for _, bg := range blockgroups {
-		laddr := btrfs.LogicalAddr(bg.Key.ObjectID)
-		attrs := groupAttrs{
-			Size:  btrfs.AddrDelta(bg.Key.Offset),
-			Flags: bg.BG.Flags,
-		}
-		// If there's a conflict, but they both say the same thing (existing == attrs),
-		// then just ignore the dup.
-		if existing, conflict := groups[laddr]; conflict && existing != attrs {
-			fmt.Printf("error: conflicting blockgroups for laddr=%v\n", laddr)
-			continue
-		}
-		groups[laddr] = attrs
-	}
-
-	// sort the keys to that datastructure
-	sortedLAddrs := make([]btrfs.LogicalAddr, 0, len(groups))
-	for laddr := range groups {
-		sortedLAddrs = append(sortedLAddrs, laddr)
-	}
-	sort.Slice(sortedLAddrs, func(i, j int) bool {
-		return sortedLAddrs[i] < sortedLAddrs[j]
-	})
-
-	// cluster
-	type cluster struct {
-		LAddr btrfs.LogicalAddr
-		Size  btrfs.AddrDelta
-		Flags btrfsvol.BlockGroupFlags
-	}
-	var clusters []*cluster
-	for _, laddr := range sortedLAddrs {
-		attrs := groups[laddr]
-
-		var lastCluster *cluster
-		if len(clusters) > 0 {
-			lastCluster = clusters[len(clusters)-1]
-		}
-		if lastCluster != nil && laddr == lastCluster.LAddr.Add(lastCluster.Size) && attrs.Flags == lastCluster.Flags {
-			lastCluster.Size += attrs.Size
-		} else {
-			clusters = append(clusters, &cluster{
-				LAddr: laddr,
-				Size:  attrs.Size,
-				Flags: attrs.Flags,
-			})
-		}
-	}
-
-	// print
-	var prev btrfs.LogicalAddr
-	for _, cluster := range clusters {
-		delta := cluster.LAddr - prev
-		fmt.Printf("blockgroup cluster: laddr=%v (+%v); size=%v ; flags=%v\n",
-			cluster.LAddr, delta, cluster.Size, cluster.Flags)
-		prev = cluster.LAddr.Add(cluster.Size)
-	}
-}
-
-func pass1PrintReconstructedChunks(fs *btrfs.FS) {
+func pass1PrintLogicalSpace(fs *btrfs.FS) {
 	mappings := fs.LV.Mappings()
-	var prevLAddr btrfsvol.LogicalAddr
+	var prevBeg, prevEnd btrfsvol.LogicalAddr
+	var sumHole, sumChunk btrfsvol.AddrDelta
 	for _, mapping := range mappings {
-		if mapping.LAddr != prevLAddr {
+		if mapping.LAddr > prevEnd {
+			size := mapping.LAddr.Sub(prevEnd)
+			fmt.Printf("hole  laddr=%v size=%v\n", prevEnd, size)
+			sumHole += size
+		}
+		if mapping.LAddr != prevBeg {
 			if mapping.Flags == nil {
 				fmt.Printf("chunk laddr=%v size=%v flags=(missing)\n",
 					mapping.LAddr, mapping.Size)
@@ -365,8 +305,14 @@ func pass1PrintReconstructedChunks(fs *btrfs.FS) {
 		}
 		fmt.Printf("\tstripe dev_id=%v paddr=%v\n",
 			mapping.PAddr.Dev, mapping.PAddr.Addr)
-		prevLAddr = mapping.LAddr
+		sumChunk += mapping.Size
+		prevBeg = mapping.LAddr
+		prevEnd = mapping.LAddr.Add(mapping.Size)
 	}
+	p := message.NewPrinter(message.MatchLanguage("en"))
+	p.Printf("total logical holes      = %v (%d)\n", sumHole, int64(sumHole))
+	p.Printf("total logical chunks     = %v (%d)\n", sumChunk, int64(sumChunk))
+	p.Printf("total logical addr space = %v (%d)\n", prevEnd, int64(prevEnd))
 }
 
 func pass1WriteReconstructedChunks(
diff --git a/go.mod b/go.mod
index 738253f..9aa3e50 100644
--- a/go.mod
+++ b/go.mod
@@ -6,6 +6,7 @@ require (
 	github.com/davecgh/go-spew v1.1.0
 	github.com/stretchr/testify v1.7.1
 	golang.org/x/exp v0.0.0-20220518171630-0b5c67f07fdf
+	golang.org/x/text v0.3.7
 )
 
 require (
diff --git a/go.sum b/go.sum
index e031691..8d735b5 100644
--- a/go.sum
+++ b/go.sum
@@ -7,6 +7,8 @@ github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMT
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 golang.org/x/exp v0.0.0-20220518171630-0b5c67f07fdf h1:oXVg4h2qJDd9htKxb5SCpFBHLipW6hXmL3qpUixS2jw=
 golang.org/x/exp v0.0.0-20220518171630-0b5c67f07fdf/go.mod h1:yh0Ynu2b5ZUe3MQfp2nM0ecK7wsgouWTDN0FNeJuIys=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=