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

Remove inline-nevers

Browse source
This commit is contained in:
Igor Katson 2023-11-19 21:50:50 +00:00
parent 98dbecf136
commit 0170b19fcd
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
2 changed files with 8 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

23
crates/librqbit/src/torrent_state.rs
View file

@ -65,7 +65,7 @@ pub struct PeerStates {
states: DashMap<PeerHandle, Peer>, states: DashMap<PeerHandle, Peer>,
} }
#[derive(Debug, Default)] #[derive(Debug, Default, Serialize)]
pub struct AggregatePeerStats { pub struct AggregatePeerStats {
pub queued: usize, pub queued: usize,
pub connecting: usize, pub connecting: usize,
@ -240,15 +240,10 @@ pub struct StatsSnapshot {
pub initially_needed_bytes: u64, pub initially_needed_bytes: u64,
pub remaining_bytes: u64, pub remaining_bytes: u64,
pub total_bytes: u64, pub total_bytes: u64,
pub live_peers: u32,
pub seen_peers: u32,
pub connecting_peers: u32,
#[serde(skip)] #[serde(skip)]
pub time: Instant, pub time: Instant,
pub queued_peers: u32,
pub dead_peers: u32,
pub total_piece_download_ms: u64, pub total_piece_download_ms: u64,
pub not_needed_peers: u32, pub peer_stats: AggregatePeerStats,
} }
impl StatsSnapshot { impl StatsSnapshot {
@ -826,16 +821,11 @@ impl TorrentState {
fetched_bytes: self.stats.fetched_bytes.load(Relaxed), fetched_bytes: self.stats.fetched_bytes.load(Relaxed),
uploaded_bytes: self.stats.uploaded.load(Relaxed), uploaded_bytes: self.stats.uploaded.load(Relaxed),
total_bytes: self.have_plus_needed, total_bytes: self.have_plus_needed,
live_peers: peer_stats.live as u32,
seen_peers: peer_stats.seen as u32,
connecting_peers: peer_stats.connecting as u32,
time: Instant::now(), time: Instant::now(),
initially_needed_bytes: self.needed, initially_needed_bytes: self.needed,
remaining_bytes: remaining, remaining_bytes: remaining,
queued_peers: peer_stats.queued as u32,
dead_peers: peer_stats.dead as u32,
not_needed_peers: peer_stats.not_needed as u32,
total_piece_download_ms: self.stats.total_piece_download_ms.load(Relaxed), total_piece_download_ms: self.stats.total_piece_download_ms.load(Relaxed),
peer_stats,
} }
} }
@ -918,7 +908,6 @@ impl PeerConnectionHandler for PeerHandler {
} }
impl PeerHandler { impl PeerHandler {
#[inline(never)]
fn on_download_request(&self, peer_handle: PeerHandle, request: Request) -> anyhow::Result<()> { fn on_download_request(&self, peer_handle: PeerHandle, request: Request) -> anyhow::Result<()> {
let piece_index = match self.state.lengths.validate_piece_index(request.index) { let piece_index = match self.state.lengths.validate_piece_index(request.index) {
Some(p) => p, Some(p) => p,
@ -970,7 +959,6 @@ impl PeerHandler {
Ok::<_, anyhow::Error>(tx.send(request)?) Ok::<_, anyhow::Error>(tx.send(request)?)
} }
#[inline(never)]
fn on_have(&self, handle: PeerHandle, have: u32) { fn on_have(&self, handle: PeerHandle, have: u32) {
self.state.peers.with_live_mut(handle, "on_have", |live| { self.state.peers.with_live_mut(handle, "on_have", |live| {
if let Some(bitfield) = live.bitfield.as_mut() { if let Some(bitfield) = live.bitfield.as_mut() {
@ -980,7 +968,6 @@ impl PeerHandler {
}); });
} }
#[inline(never)]
fn on_bitfield(&self, handle: PeerHandle, bitfield: ByteString) -> anyhow::Result<()> { fn on_bitfield(&self, handle: PeerHandle, bitfield: ByteString) -> anyhow::Result<()> {
if bitfield.len() != self.state.lengths.piece_bitfield_bytes() { if bitfield.len() != self.state.lengths.piece_bitfield_bytes() {
anyhow::bail!( anyhow::bail!(
@ -1029,13 +1016,11 @@ impl PeerHandler {
Ok::<_, anyhow::Error>(()) Ok::<_, anyhow::Error>(())
} }
#[inline(never)]
fn on_i_am_choked(&self, handle: PeerHandle) { fn on_i_am_choked(&self, handle: PeerHandle) {
debug!("we are choked"); debug!("we are choked");
self.state.peers.mark_i_am_choked(handle, true); self.state.peers.mark_i_am_choked(handle, true);
} }
#[inline(never)]
fn on_peer_interested(&self, handle: PeerHandle) { fn on_peer_interested(&self, handle: PeerHandle) {
debug!("peer is interested"); debug!("peer is interested");
self.state.peers.mark_peer_interested(handle, true); self.state.peers.mark_peer_interested(handle, true);
@ -1181,7 +1166,6 @@ impl PeerHandler {
Ok(()) Ok(())
} }
#[inline(never)]
fn on_i_am_unchoked(&self, handle: PeerHandle) { fn on_i_am_unchoked(&self, handle: PeerHandle) {
debug!("we are unchoked"); debug!("we are unchoked");
self.state self.state
@ -1193,7 +1177,6 @@ impl PeerHandler {
}); });
} }
#[inline(never)]
fn on_received_piece(&self, handle: PeerHandle, piece: Piece<ByteBuf>) -> anyhow::Result<()> { fn on_received_piece(&self, handle: PeerHandle, piece: Piece<ByteBuf>) -> anyhow::Result<()> {
let chunk_info = match self.state.lengths.chunk_info_from_received_piece( let chunk_info = match self.state.lengths.chunk_info_from_received_piece(
piece.index, piece.index,

10
crates/rqbit/src/main.rs
View file

@ -263,11 +263,11 @@ async fn async_main(opts: Opts, spawner: BlockingSpawner) -> anyhow::Result<()>
SF::new(stats.remaining_bytes), SF::new(stats.remaining_bytes),
SF::new(total), SF::new(total),
SF::new(stats.uploaded_bytes), SF::new(stats.uploaded_bytes),
stats.live_peers, stats.peer_stats.live,
stats.connecting_peers, stats.peer_stats.connecting,
stats.queued_peers, stats.peer_stats.queued,
stats.seen_peers, stats.peer_stats.seen,
stats.dead_peers, stats.peer_stats.dead,
); );
}, },
} }