From 99e09aa4eebd71ae1179af09e11f78ac36ccce8d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 12 Feb 2023 11:36:22 -0700 Subject: Makefile: Use -trimpath when building --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 07cb57d..8c78285 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ # main build: - go build -o bin/ ./cmd/... + go build -trimpath -o bin/ ./cmd/... .PHONY: build check: -- cgit v1.2.3-2-g168b From d843b30bd3218c0cb0a6f9c070478b5352b77395 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 12 Feb 2023 11:52:13 -0700 Subject: scripts: Remove scripts for running C btrfs-progs Except for diff-dump-tree.sh, since that's doing a comparison. --- scripts/run-check.sh | 6 ------ scripts/run-chunk-recover.sh | 7 ------- 2 files changed, 13 deletions(-) delete mode 100755 scripts/run-check.sh delete mode 100755 scripts/run-chunk-recover.sh diff --git a/scripts/run-check.sh b/scripts/run-check.sh deleted file mode 100755 index 6301305..0000000 --- a/scripts/run-check.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -e -rm -f ../scratch/dump-check.img -cp --reflink=always ../scratch/dump-{clearnodes,check}.img -make -C ../btrfs-progs -time ../btrfs-progs/btrfs check --progress --repair ../scratch/dump-check.img diff --git a/scripts/run-chunk-recover.sh b/scripts/run-chunk-recover.sh deleted file mode 100755 index f9a93d3..0000000 --- a/scripts/run-chunk-recover.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -e -rm -f ../scratch/dump-scratch.img -cp --reflink=always ../scratch/dump-{zero,scratch}.img -chmod 600 ../scratch/dump-scratch.img -make -C ../btrfs-progs -time ../btrfs-progs/btrfs rescue chunk-recover ../scratch/dump-scratch.img -- cgit v1.2.3-2-g168b From 6ad6b1faaded4618b7022644f712c9c17b58c200 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 12 Feb 2023 11:53:02 -0700 Subject: scripts: Remove scripts to run commands that no longer exist --- scripts/run-clear-nodes.sh | 5 ----- scripts/run-fsck.sh | 9 --------- 2 files changed, 14 deletions(-) delete mode 100755 scripts/run-clear-nodes.sh delete mode 100755 scripts/run-fsck.sh diff --git a/scripts/run-clear-nodes.sh b/scripts/run-clear-nodes.sh deleted file mode 100755 index 48186f8..0000000 --- a/scripts/run-clear-nodes.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -e -rm -f ../scratch/dump-clearnodes.img -cp --reflink=always ../scratch/dump-{scratch,clearnodes}.img -time go run ./cmd/btrfs-rec repair clear-bad-nodes --pv=../scratch/dump-clearnodes.img diff --git a/scripts/run-fsck.sh b/scripts/run-fsck.sh deleted file mode 100755 index 7fca6c0..0000000 --- a/scripts/run-fsck.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -e -rm -f ../scratch/dump-scratch.img -cp --reflink=always ../scratch/dump-{zero,scratch}.img -chmod 600 ../scratch/dump-scratch.img -time go run ./cmd/btrfs-fsck ../scratch/dump-scratch.img -#make -C ../btrfs-progs -#time ../btrfs-progs/btrfs rescue chunk-recover ../scratch/dump-scratch.img -#time ../btrfs-progs/btrfs check ../scratch/dump-scratch.img -- cgit v1.2.3-2-g168b From ea319c1b817e65ad0808f08343b3203e62ab15a9 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 12 Feb 2023 11:48:38 -0700 Subject: scripts: Clean up the scripts to be clearer and more consistent --- scripts/diff-dump-tree.sh | 13 +++++++++-- scripts/main.sh | 58 +++++++++++++++++++++++++++-------------------- scripts/mount.sh | 18 ++++++++++----- 3 files changed, 56 insertions(+), 33 deletions(-) diff --git a/scripts/diff-dump-tree.sh b/scripts/diff-dump-tree.sh index 3d560d9..c3de337 100755 --- a/scripts/diff-dump-tree.sh +++ b/scripts/diff-dump-tree.sh @@ -1,4 +1,8 @@ #!/bin/bash +readonly image=../scratch/new.img + +###################################################################### + set -e ( cd ../btrfs-progs @@ -12,14 +16,19 @@ set -e fi make ) + +make build + +###################################################################### + diff -u \ - <(../btrfs-progs/btrfs inspect dump-tree --noscan --csum-items ../scratch/new.img | + <(../btrfs-progs/btrfs inspect dump-tree --noscan --csum-items "$image" | sed -e 's/ UNKNOWN.0 / UNTYPED /g' \ -e 's/\b18446744073709551615\b/-1/g' \ -e 's/INODE_REF 6)/INODE_REF ROOT_TREE_DIR)/g' \ -e 's/ROOT_BACKREF 5)/ROOT_BACKREF FS_TREE)/g' \ ) \ - <(go run ./cmd/btrfs-rec/ inspect dump-trees --pv=../scratch/new.img | + <(./bin/btrfs-rec inspect dump-trees --pv="$image" | sed -E \ -e 's/([0-9]),/\1/g' \ ) diff --git a/scripts/main.sh b/scripts/main.sh index d89f387..73eada7 100755 --- a/scripts/main.sh +++ b/scripts/main.sh @@ -1,30 +1,38 @@ #!/bin/bash +readonly image=../scratch/dump-zero.img + +###################################################################### + set -e -b=../scratch/dump-zero -gen() ( + +run-btrfs-rec() { local tgt=$1; shift local log=${tgt%.*}.log if test -s "$tgt"; then return fi - { set -x; command time --verbose "$@"; } \ - >"$tgt" \ - 2> >(tee >&2 "$log") -) + { + set -x; + command time --verbose \ + ./bin/btrfs-rec \ + --pv="$image" \ + "$@" + } >"$tgt" 2> >(tee >&2 "$log") +} set -x -CGO_ENABLED=0 go build -trimpath ./cmd/btrfs-rec -mkdir -p "$b.gen" +make build +gendir="${image%.img}.gen" +mkdir -p "$gendir" +export GOMEMLIMIT="$(awk '/^MemTotal:/{ print $2 "KiB" }' /dev/null -export GOMEMLIMIT="$(awk '/^MemTotal:/{ print $2 "KiB" }' Date: Sun, 12 Feb 2023 11:50:26 -0700 Subject: scripts/main.sh: Record cpu and allocs profiles --- scripts/main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/main.sh b/scripts/main.sh index 73eada7..365862f 100755 --- a/scripts/main.sh +++ b/scripts/main.sh @@ -16,6 +16,8 @@ run-btrfs-rec() { command time --verbose \ ./bin/btrfs-rec \ --pv="$image" \ + --profile.cpu="${tgt%.*}.cpu.pprof" \ + --profile.allocs="${tgt%.*}.allocs.pprof" \ "$@" } >"$tgt" 2> >(tee >&2 "$log") } -- cgit v1.2.3-2-g168b