E2E drop check for memory leaks
This commit is contained in:
parent
3067ad21d5
commit
2ad5fa2f12
2 changed files with 53 additions and 7 deletions
|
|
@ -16,7 +16,7 @@ use crate::{
|
|||
create_torrent,
|
||||
tests::test_util::{
|
||||
create_default_random_dir_with_torrents, setup_test_logging, spawn_debug_server,
|
||||
TestPeerMetadata,
|
||||
DropChecks, TestPeerMetadata,
|
||||
},
|
||||
AddTorrentOptions, AddTorrentResponse, Session, SessionOptions, SessionPersistenceConfig,
|
||||
};
|
||||
|
|
@ -28,13 +28,20 @@ async fn test_e2e_download() {
|
|||
.and_then(|v| v.parse().ok())
|
||||
.unwrap_or(180);
|
||||
|
||||
tokio::time::timeout(Duration::from_secs(timeout), _test_e2e_download())
|
||||
.await
|
||||
.context("test_e2e_download timed out")
|
||||
.unwrap()
|
||||
let drop_checks = DropChecks::default();
|
||||
tokio::time::timeout(
|
||||
Duration::from_secs(timeout),
|
||||
_test_e2e_download(&drop_checks),
|
||||
)
|
||||
.await
|
||||
.context("test_e2e_download timed out")
|
||||
.unwrap();
|
||||
|
||||
// Wait to ensure everything is dropped.
|
||||
tokio::time::sleep(Duration::from_secs(1)).await;
|
||||
}
|
||||
|
||||
async fn _test_e2e_download() {
|
||||
async fn _test_e2e_download(drop_checks: &DropChecks) {
|
||||
setup_test_logging();
|
||||
match crate::try_increase_nofile_limit() {
|
||||
Ok(limit) => info!(limit, "increased ulimit"),
|
||||
|
|
@ -75,6 +82,7 @@ async fn _test_e2e_download() {
|
|||
for i in 0..num_servers {
|
||||
let torrent_file_bytes = torrent_file_bytes.clone();
|
||||
let tempdir = tempdir.path().to_owned();
|
||||
let drop_checks = drop_checks.clone();
|
||||
let fut = spawn(
|
||||
async move {
|
||||
let peer_id = TestPeerMetadata {
|
||||
|
|
@ -104,6 +112,8 @@ async fn _test_e2e_download() {
|
|||
.await
|
||||
.context("error starting session")?;
|
||||
|
||||
drop_checks.add(&session, format!("server session {i}"));
|
||||
|
||||
info!("started session");
|
||||
|
||||
let handle = session
|
||||
|
|
@ -130,6 +140,7 @@ async fn _test_e2e_download() {
|
|||
if !l.is_finished() {
|
||||
bail!("torrent went live, but expected it to be finished");
|
||||
}
|
||||
drop_checks.add(l, format!("server {i} live"));
|
||||
Ok(true)
|
||||
}
|
||||
crate::ManagedTorrentState::Error(e) => bail!("error: {e:?}"),
|
||||
|
|
@ -201,6 +212,7 @@ async fn _test_e2e_download() {
|
|||
)
|
||||
.await
|
||||
.unwrap();
|
||||
drop_checks.add(&session, "client session");
|
||||
|
||||
info!("started client session");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,13 @@
|
|||
use std::{io::Write, path::Path};
|
||||
use std::{
|
||||
io::Write,
|
||||
path::Path,
|
||||
sync::{Arc, Weak},
|
||||
};
|
||||
|
||||
use anyhow::Context;
|
||||
use axum::{response::IntoResponse, routing::get, Router};
|
||||
use librqbit_core::Id20;
|
||||
use parking_lot::RwLock;
|
||||
use rand::{thread_rng, Rng, RngCore, SeedableRng};
|
||||
use tempfile::TempDir;
|
||||
use tracing::{debug, info};
|
||||
|
|
@ -124,3 +129,32 @@ async fn debug_server() -> anyhow::Result<()> {
|
|||
pub fn spawn_debug_server() {
|
||||
tokio::spawn(debug_server());
|
||||
}
|
||||
|
||||
pub trait DropPlaceholder: Send + Sync {}
|
||||
impl<T: Send + Sync> DropPlaceholder for T {}
|
||||
|
||||
struct DropCheck {
|
||||
obj: Weak<dyn DropPlaceholder>,
|
||||
name: String,
|
||||
}
|
||||
|
||||
#[derive(Default, Clone)]
|
||||
pub struct DropChecks(Arc<RwLock<Vec<DropCheck>>>);
|
||||
|
||||
impl DropChecks {
|
||||
pub fn add<T: DropPlaceholder + 'static, S: Into<String>>(&self, obj: &Arc<T>, name: S) {
|
||||
let weak = Arc::downgrade(obj);
|
||||
self.0.write().push(DropCheck {
|
||||
obj: weak as Weak<dyn DropPlaceholder>,
|
||||
name: name.into(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for DropCheck {
|
||||
fn drop(&mut self) {
|
||||
if self.obj.upgrade().is_some() {
|
||||
panic!("memory leak: {}", self.name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue