Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync: add watch::Sender::send_modify method #4310

Merged
merged 11 commits into from
Feb 22, 2022
Merged

sync: add watch::Sender::send_modify method #4310

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d720599
sync: add `watch::Sender::send_modify` method
nylonicious Dec 10, 2021
e1e73da
fix typo
nylonicious Dec 10, 2021
aeca6b1
Include comments from `send_replace` method
nylonicious Dec 10, 2021
d629aa4
Replace impl of `send_replace` with call to `send_modify`
nylonicious Dec 10, 2021
02c1a2a
Catch and propagate panics inside func to the caller
nylonicious Dec 10, 2021
460c3e9
Drop lock before we resume unwinding
nylonicious Dec 10, 2021
d1de3e0
`Sender::send` call `send_modify` instead `send_replace`
nylonicious Dec 10, 2021
dcf9ffc
Add test
nylonicious Dec 10, 2021
b142f96
Document panic behaviour
nylonicious Dec 10, 2021
69cb652
Improve documentation and check for value after panic
nylonicious Dec 10, 2021
fc551f5
Restore old watch::Sender::send behaviour
nylonicious Jan 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions tokio/src/sync/watch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ use crate::loom::sync::atomic::Ordering::Relaxed;
use crate::loom::sync::{Arc, RwLock, RwLockReadGuard};
use std::mem;
use std::ops;
use std::panic;

/// Receives values from the associated [`Sender`](struct@Sender).
///
Expand Down Expand Up @@ -461,8 +462,14 @@ impl<T> Sender<T> {
{
// Acquire the write lock and update the value.
let mut lock = self.shared.value.write().unwrap();
// Update the value.
func(&mut lock);
// Update the value and catch possible panic inside func.
let result = panic::catch_unwind(panic::AssertUnwindSafe(|| {
func(&mut lock);
}));
// If the func panicked return the panic to the caller.
if let Err(error) = result {
panic::resume_unwind(error);
}

self.shared.state.increment_version();

Expand Down