fix stress test; improve progress messages

Sebastian Thiel committed 6 years ago

Commit 37ccd921 parent e53141d3 files · +4 −4Browse files

Unified · Split

3 files

Makefile +2 −2
git-odb/src/pack/index/traverse/indexed.rs +1 −1
git-odb/src/pack/index/traverse/reduce.rs +1 −1

@@ -105,9 +105,9 @@ $(linux_repo): · 104 unmodified lines
105		105
106	stress: ## Run various algorithms on big repositories	106	stress: ## Run various algorithms on big repositories
107	$(MAKE) -j3 $(linux_repo) $(rust_repo) release-lean	107	$(MAKE) -j3 $(linux_repo) $(rust_repo) release-lean
108	time ./target/release/gixp pack-verify --verbose --statistics $(rust_repo)/.git/objects/pack/*.idx	108	time ./target/release/gixp pack-verify --verbose --statistics $(rust_repo)/objects/pack/*.idx
109	time ./target/release/gixp pack-verify --verbose --algorithm less-memory $(rust_repo)/.git/objects/pack/*.idx	109	time ./target/release/gixp pack-verify --verbose --algorithm less-memory $(rust_repo)/.git/objects/pack/*.idx
110	time ./target/release/gixp pack-verify --verbose --re-encode $(rust_repo)/.git/objects/pack/*.idx	110	time ./target/release/gixp pack-verify --verbose --re-encode $(rust_repo)/objects/pack/*.idx
111	time ./target/release/gixp pack-verify --verbose --re-encode $(linux_repo)/objects/pack/*.idx	111	time ./target/release/gixp pack-verify --verbose --re-encode $(linux_repo)/objects/pack/*.idx
112		112
113	##@ Maintenance	113	##@ Maintenance

git-odb/src/pack/index/traverse/indexed.rs+1−1

@@ -42,7 +42,7 @@ impl index::File { · 41 unmodified lines
42	let if_there_are_enough_objects = \|\| self.num_objects > 10_000;	42	let if_there_are_enough_objects = \|\| self.num_objects > 10_000;
43		43
44	let reduce_progress = std::sync::Mutex::new({	44	let reduce_progress = std::sync::Mutex::new({
45	let mut p = root.add_child("Checking");	45	let mut p = root.add_child("Iterating");
46	p.init(Some(self.num_objects()), Some("objects"));	46	p.init(Some(self.num_objects()), Some("objects"));
47	p	47	p
48	});	48	});

git-odb/src/pack/index/traverse/reduce.rs+1−1

@@ -99,7 +99,7 @@ where · 98 unmodified lines
99	let objects_per_second = (self.entries_seen as f32 / elapsed_s) as u32;	99	let objects_per_second = (self.entries_seen as f32 / elapsed_s) as u32;
100		100
101	self.progress.lock().unwrap().info(format!(	101	self.progress.lock().unwrap().info(format!(
102	"Verified {} objects in {:.2}s ({} objects/s, ~{}/s)",	102	"of {} objects done in {:.2}s ({} objects/s, ~{}/s)",
103	self.entries_seen,	103	self.entries_seen,
104	elapsed_s,	104	elapsed_s,
105	objects_per_second,	105	objects_per_second,