Skip to content

fix: fix scout deadlock #188

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

Merged
Mallets merged 1 commit into from
Apr 22, 2024
Merged

fix: fix scout deadlock #188

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions src/session.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ impl _PullSubscriber {
}

#[pyclass(subclass)]
pub struct _Scout(Scout<()>);
pub struct _Scout(Option<Scout<()>>);

#[pyfunction]
pub fn scout(
Expand All @@ -315,7 +315,13 @@ pub fn scout(
let config = config.and_then(|c| c.0.clone().take()).unwrap_or_default();
let scout = zenoh::scout(what, config).with(callback).res_sync();
match scout {
Ok(scout) => Ok(_Scout(scout)),
Ok(scout) => Ok(_Scout(Some(scout))),
Err(e) => Err(e.to_pyerr()),
}
}

impl Drop for _Scout {
fn drop(&mut self) {
Python::with_gil(|gil| gil.allow_threads(|| drop(self.0.take())));
}
}