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

Jump to bottom

Fix join error message (was inconsistent with: VM controller thread) #4744

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix join error message (was inconsistent with: VM controller thread) #4744

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a23b95e
Fix join error message (was inconsistent with: VM controller thread)
sydhds Sep 19, 2024
4b98b3c
Cargo fmt pass
sydhds Sep 20, 2024
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
8 changes: 5 additions & 3 deletions massa-execution-worker/src/controller.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ pub struct ExecutionManagerImpl {
impl ExecutionManager for ExecutionManagerImpl {
/// stops the worker
fn stop(&mut self) {
info!("stopping Execution controller...");
info!("Stopping Execution controller...");
// notify the worker thread to stop
{
let mut input_wlock = self.input_data.1.lock();
Expand All @@ -544,8 +544,10 @@ impl ExecutionManager for ExecutionManagerImpl {
}
// join the execution thread
if let Some(join_handle) = self.thread_handle.take() {
join_handle.join().expect("VM controller thread panicked");
join_handle
.join()
.expect("Execution controller thread panicked");
}
info!("execution controller stopped");
info!("Execution controller stopped");
}
}
Loading