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

Remove custom ceil_div_u64

Browse source
This commit is contained in:
Igor Katson 2024-03-30 12:00:40 +00:00
parent 9722dd8cb7
commit 950e0cd50e
2 changed files with 7 additions and 11 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::{ceil_div_u64, last_element_size_u64, ChunkInfo}, lengths::{last_element_size_u64, ChunkInfo},
torrent_metainfo::TorrentMetaV1Info, torrent_metainfo::TorrentMetaV1Info,
}; };
use parking_lot::{Mutex, RwLock}; use parking_lot::{Mutex, RwLock};
@ -76,7 +76,7 @@ impl HandlerLocked {
anyhow::bail!("metadata size {} is too big", metadata_size); anyhow::bail!("metadata size {} is too big", metadata_size);
} }
let buffer = vec![0u8; metadata_size as usize]; let buffer = vec![0u8; metadata_size as usize];
let total_pieces = ceil_div_u64(metadata_size as u64, CHUNK_SIZE as u64); let total_pieces = (metadata_size as u64).div_ceil(CHUNK_SIZE as u64);
let received_pieces = vec![false; total_pieces as usize]; let received_pieces = vec![false; total_pieces as usize];
Ok(Self { Ok(Self {
metadata_size, metadata_size,

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

@ -6,10 +6,6 @@ const fn is_power_of_two(x: u64) -> bool {
(x != 0) && ((x & (x - 1)) == 0) (x != 0) && ((x & (x - 1)) == 0)
} }
pub const fn ceil_div_u64(a: u64, b: u64) -> u64 {
(a + b - 1) / b
}
pub const fn last_element_size_u64(total: u64, chunk_size: u64) -> u64 { pub const fn last_element_size_u64(total: u64, chunk_size: u64) -> u64 {
let rem = total % chunk_size; let rem = total % chunk_size;
if rem == 0 { if rem == 0 {
@ -100,21 +96,21 @@ impl Lengths {
if total_length == 0 { if total_length == 0 {
anyhow::bail!("torrent with 0 length") anyhow::bail!("torrent with 0 length")
} }
let total_pieces = ceil_div_u64(total_length, piece_length as u64) as u32; let total_pieces = total_length.div_ceil(piece_length as u64) as u32;
Ok(Self { Ok(Self {
chunk_length, chunk_length,
piece_length, piece_length,
total_length, total_length,
max_chunks_per_piece: ceil_div_u64(piece_length as u64, chunk_length as u64) as u32, max_chunks_per_piece: (piece_length as u64).div_ceil(chunk_length 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_u64(total_length, piece_length as u64) as u32,
}) })
} }
pub const fn piece_bitfield_bytes(&self) -> usize { pub const fn piece_bitfield_bytes(&self) -> usize {
ceil_div_u64(self.total_pieces() as u64, 8) as usize self.total_pieces().div_ceil(8) as usize
} }
pub const fn chunk_bitfield_bytes(&self) -> usize { pub const fn chunk_bitfield_bytes(&self) -> usize {
ceil_div_u64(self.total_chunks() as u64, 8) as usize self.total_chunks().div_ceil(8) as usize
} }
pub const fn total_length(&self) -> u64 { pub const fn total_length(&self) -> u64 {
self.total_length self.total_length
@ -139,7 +135,7 @@ impl Lengths {
self.max_chunks_per_piece self.max_chunks_per_piece
} }
pub const fn total_chunks(&self) -> u32 { pub const fn total_chunks(&self) -> u32 {
ceil_div_u64(self.total_length, self.chunk_length as u64) as u32 self.total_length.div_ceil(self.chunk_length as u64) as u32
} }
pub const fn last_piece_id(&self) -> ValidPieceIndex { pub const fn last_piece_id(&self) -> ValidPieceIndex {
ValidPieceIndex(self.last_piece_id) ValidPieceIndex(self.last_piece_id)