Skip to content

Fix race condition on wait() #504

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
merged 1 commit into from
Oct 16, 2019
Merged

Fix race condition on wait() #504

Show file tree
Hide file tree
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
7 changes: 6 additions & 1 deletion http/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,12 @@ fn serve<M: jsonrpc::Metadata, S: jsonrpc::Middleware<M>>(
}))
.map_err(|_| ())
})
.and_then(|_| done_tx.send(()))
.and_then(|(_, server)| {
// We drop the server first to prevent a situation where main thread terminates
// before the server is properly dropped (see #504 for more details)
drop(server);
done_tx.send(())
})
});
}

Expand Down
5 changes: 4 additions & 1 deletion ipc/src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,10 @@ impl<M: Metadata, S: Middleware<M>> ServerBuilder<M, S> {
.buffer_unordered(1024)
.for_each(|_| Ok(()))
.select(stop)
.map(|_| {
.map(|(_, server)| {
// We drop the server first to prevent a situation where main thread terminates
// before the server is properly dropped (see #504 for more details)
drop(server);
let _ = wait_signal.send(());
})
.map_err(|_| ()),
Expand Down