leyoda/rqbit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Report progress when validating fastresume data

Browse source
This commit is contained in:
Igor Katson 2024-08-29 15:40:45 +01:00
parent 9225e126d9
commit 0d0ba84ef6
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/librqbit/src/torrent_state/initializing.rs
View file

@ -1,5 +1,8 @@
use std::{ use std::{
sync::{atomic::AtomicU64, Arc}, sync::{
atomic::{AtomicU64, Ordering},
Arc,
},
time::Instant, time::Instant,
}; };
@ -105,11 +108,18 @@ impl TorrentStateInitializing {
have_pieces.shuffle(&mut rand::thread_rng()); have_pieces.shuffle(&mut rand::thread_rng());
// Validate a certain threshold of fastresume pieces with decreasing probability of actual disk reads. // Validate a certain threshold of fastresume pieces with decreasing probability of actual disk reads.
for (denom_minus_one, hpiece) in have_pieces.into_iter().enumerate() { for (tmp_id, hpiece) in have_pieces.iter().enumerate() {
let denom: u32 = (denom_minus_one + 1).min(50).try_into().unwrap(); let denom: u32 = (tmp_id + 1).min(50).try_into().unwrap();
if rand::thread_rng().gen_ratio(1, denom) && fo.check_piece(hpiece).is_err() { if rand::thread_rng().gen_ratio(1, denom) && fo.check_piece(*hpiece).is_err() {
return true; return true;
} }
#[allow(clippy::cast_possible_truncation)]
let progress = (self.shared.lengths.total_length() as f64
/ have_pieces.len() as f64
* (tmp_id + 1) as f64) as u64;
let progress = progress.min(self.shared.lengths.total_length());
self.checked_bytes.store(progress, Ordering::Relaxed);
} }
false false
}); });
@ -119,6 +129,7 @@ impl TorrentStateInitializing {
if let Err(e) = bitv_factory.clear(self.shared.id.into()).await { if let Err(e) = bitv_factory.clear(self.shared.id.into()).await {
warn!(error=?e, "error clearing bitfield"); warn!(error=?e, "error clearing bitfield");
} }
self.checked_bytes.store(0, Ordering::Relaxed);
return None; return None;
} }