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

Simplify chunk_size

Browse source
This commit is contained in:
Igor Katson 2024-03-30 13:44:00 +00:00
parent 3e2fac81b1
commit 0cc90f19ab
2 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/librqbit/src/peer_info_reader/mod.rs
View file

@ -5,7 +5,7 @@ use buffers::{ByteBuf, ByteBufOwned};
use librqbit_core::{ use librqbit_core::{
constants::CHUNK_SIZE, constants::CHUNK_SIZE,
hash_id::Id20, hash_id::Id20,
lengths::{last_element_size_u64, ChunkInfo}, lengths::{last_element_size, ChunkInfo},
torrent_metainfo::TorrentMetaV1Info, torrent_metainfo::TorrentMetaV1Info,
}; };
use parking_lot::{Mutex, RwLock}; use parking_lot::{Mutex, RwLock};
@ -87,7 +87,7 @@ impl HandlerLocked {
} }
fn piece_size(&self, index: u32) -> usize { fn piece_size(&self, index: u32) -> usize {
if index as usize == self.total_pieces - 1 { if index as usize == self.total_pieces - 1 {
last_element_size_u64(self.metadata_size as u64, CHUNK_SIZE as u64) as usize last_element_size(self.metadata_size as u64, CHUNK_SIZE as u64) as usize
} else { } else {
CHUNK_SIZE as usize CHUNK_SIZE as usize
} }

27
crates/librqbit_core/src/lengths.rs
View file

@ -2,9 +2,12 @@ use anyhow::Context;
use crate::{constants::CHUNK_SIZE, torrent_metainfo::TorrentMetaV1Info}; use crate::{constants::CHUNK_SIZE, torrent_metainfo::TorrentMetaV1Info};
pub const fn last_element_size_u64(total_length: u64, piece_length: u64) -> u64 { pub fn last_element_size<T>(total_length: T, piece_length: T) -> T
where
T: std::ops::Rem<Output = T> + Default + Eq + Copy,
{
let rem = total_length % piece_length; let rem = total_length % piece_length;
if rem == 0 { if rem == T::default() {
return piece_length; return piece_length;
} }
rem rem
@ -84,7 +87,7 @@ impl Lengths {
total_length, total_length,
chunks_per_piece: (piece_length as u64).div_ceil(CHUNK_SIZE as u64) as u32, chunks_per_piece: (piece_length as u64).div_ceil(CHUNK_SIZE as u64) as u32,
last_piece_id: total_pieces - 1, last_piece_id: total_pieces - 1,
last_piece_length: last_element_size_u64(total_length, piece_length as u64) as u32, last_piece_length: last_element_size(total_length, piece_length as u64) as u32,
}) })
} }
@ -151,7 +154,6 @@ impl Lengths {
} }
pub fn iter_chunk_infos(&self, index: ValidPieceIndex) -> impl Iterator<Item = ChunkInfo> { pub fn iter_chunk_infos(&self, index: ValidPieceIndex) -> impl Iterator<Item = ChunkInfo> {
// TODO: test
let mut remaining = self.piece_length(index); let mut remaining = self.piece_length(index);
let absolute_offset = index.0 * self.chunks_per_piece; let absolute_offset = index.0 * self.chunks_per_piece;
(0u32..).scan(0, move |offset, idx| { (0u32..).scan(0, move |offset, idx| {
@ -212,7 +214,7 @@ impl Lengths {
} }
pub const fn chunks_per_piece(&self, index: ValidPieceIndex) -> u32 { pub const fn chunks_per_piece(&self, index: ValidPieceIndex) -> u32 {
if index.0 == self.last_piece_id { if index.0 == self.last_piece_id {
return (self.last_piece_length + CHUNK_SIZE - 1) / CHUNK_SIZE; return self.last_piece_length.div_ceil(CHUNK_SIZE);
} }
self.chunks_per_piece self.chunks_per_piece
} }
@ -227,14 +229,15 @@ impl Lengths {
Some(chunk_index * CHUNK_SIZE) Some(chunk_index * CHUNK_SIZE)
} }
pub fn chunk_size(&self, piece_index: ValidPieceIndex, chunk_index: u32) -> Option<u32> { pub fn chunk_size(&self, piece_index: ValidPieceIndex, chunk_index: u32) -> Option<u32> {
// TODO: simplify let piece_length = self.piece_length(piece_index);
let chunks_per_piece = self.chunks_per_piece(piece_index); let last_chunk_id = piece_length.div_ceil(CHUNK_SIZE) - 1;
let pl = self.piece_length(piece_index); if chunk_index < last_chunk_id {
if chunk_index >= chunks_per_piece { return Some(CHUNK_SIZE);
return None;
} }
let offset = chunk_index * CHUNK_SIZE; if chunk_index == last_chunk_id {
Some(std::cmp::min(CHUNK_SIZE, pl - offset)) return Some(last_element_size(piece_length, CHUNK_SIZE));
}
return None;
} }
} }