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

Fix a rare deadlock

Browse source
This commit is contained in:
Igor Katson 2024-08-25 15:40:49 +01:00
parent adb17e4214
commit c12fcd7902
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/librqbit/src/torrent_state/live/mod.rs
View file

@ -725,8 +725,8 @@ impl TorrentStateLive {
fn on_piece_completed(&self, id: ValidPieceIndex) -> anyhow::Result<()> { fn on_piece_completed(&self, id: ValidPieceIndex) -> anyhow::Result<()> {
let mut g = self.lock_write("on_piece_completed"); let mut g = self.lock_write("on_piece_completed");
let g = &mut **g; let locked = &mut **g;
let chunks = g.get_chunks_mut()?; let chunks = locked.get_chunks_mut()?;
// if we have all the pieces of the file, reopen it read only // if we have all the pieces of the file, reopen it read only
for (idx, file_info) in self for (idx, file_info) in self
@ -743,20 +743,22 @@ impl TorrentStateLive {
self.streams self.streams
.wake_streams_on_piece_completed(id, &self.torrent.lengths); .wake_streams_on_piece_completed(id, &self.torrent.lengths);
g.unflushed_bitv_bytes += self.torrent.lengths.piece_length(id) as u64; locked.unflushed_bitv_bytes += self.torrent.lengths.piece_length(id) as u64;
if g.unflushed_bitv_bytes >= FLUSH_BITV_EVERY_BYTES { if locked.unflushed_bitv_bytes >= FLUSH_BITV_EVERY_BYTES {
g.try_flush_bitv() locked.try_flush_bitv()
} }
let chunks = g.get_chunks()?; let chunks = locked.get_chunks()?;
if chunks.is_finished() { if chunks.is_finished() {
if chunks.get_selected_pieces()[id.get_usize()] { if chunks.get_selected_pieces()[id.get_usize()] {
g.try_flush_bitv(); locked.try_flush_bitv();
info!("torrent finished downloading"); info!("torrent finished downloading");
} }
self.finished_notify.notify_waiters(); self.finished_notify.notify_waiters();
if !self.has_active_streams_unfinished_files(g) { if !self.has_active_streams_unfinished_files(locked) {
// prevent deadlocks.
drop(g);
// There is not poing being connected to peers that have all the torrent, when // There is not poing being connected to peers that have all the torrent, when
// we don't need anything from them, and they don't need anything from us. // we don't need anything from them, and they don't need anything from us.
self.disconnect_all_peers_that_have_full_torrent(); self.disconnect_all_peers_that_have_full_torrent();