actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-06-26 23:17:43 +02:00
Code Issues Releases Wiki Activity

prevent arbiter leaks by waiting for registration

Browse Source
This commit is contained in:
Rob Ede
2021-01-31 04:41:28 +00:00
parent b75254403a
commit 2fa60b07ae
5 changed files with 62 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
actix-rt/tests/tests.rs
View File

@ -28,7 +28,7 @@ fn join_another_arbiter() {
let arbiter = Arbiter::new();
arbiter.spawn(Box::pin(async move {
tokio::time::sleep(time).await;
Arbiter::handle().stop();
Arbiter::current().stop();
}));
arbiter.join().unwrap();
});
@ -43,7 +43,7 @@ fn join_another_arbiter() {
arbiter.spawn_fn(move || {
actix_rt::spawn(async move {
tokio::time::sleep(time).await;
Arbiter::handle().stop();
Arbiter::current().stop();
});
});
arbiter.join().unwrap();
@ -58,7 +58,7 @@ fn join_another_arbiter() {
let arbiter = Arbiter::new();
arbiter.spawn(Box::pin(async move {
tokio::time::sleep(time).await;
Arbiter::handle().stop();
Arbiter::current().stop();
}));
arbiter.stop();
arbiter.join().unwrap();
@ -190,7 +190,7 @@ fn system_arbiter_spawn() {
thread::spawn(|| {
// this thread will have no arbiter in it's thread local so call will panic
Arbiter::handle();
Arbiter::current();
})
.join()
.unwrap_err();
@ -200,8 +200,8 @@ fn system_arbiter_spawn() {
System::set_current(sys);
let sys = System::current();
let wrk = sys.arbiter();
wrk.spawn(async move {
let arb = sys.arbiter();
arb.spawn(async move {
tx.send(42u32).unwrap();
System::current().stop();
});
@ -210,3 +210,22 @@ fn system_arbiter_spawn() {
assert_eq!(runner.block_on(rx).unwrap(), 42);
thread.join().unwrap();
}
#[test]
fn system_stop_stops_arbiters() {
let sys = System::new();
let arb = Arbiter::new();
// arbiter should be alive to receive spawn msg
assert!(Arbiter::current().spawn_fn(|| {}));
assert!(arb.spawn_fn(|| {}));
System::current().stop();
sys.run().unwrap();
// arbiter should be dead and return false
assert!(!Arbiter::current().spawn_fn(|| {}));
assert!(!arb.spawn_fn(|| {}));
arb.join().unwrap();
}