Skip to content

implement clean shutdown for server threads [CPP-237] #93

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 4 commits into from
Jul 21, 2021
Merged

implement clean shutdown for server threads [CPP-237] #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
723fac0
wait for server thread to terminate
Jul 21, 2021
71295d1
Formatting and lint. (#92)
john-michaelburke Jul 21, 2021
f577e49
adjust timeouts for Windows
Jul 21, 2021
83c76f1
Add TODO
Jul 21, 2021
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
4 changes: 1 addition & 3 deletions console_backend/benches/cpu_benches.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,7 @@ fn run_process_messages(file_in_name: &str, failure: bool) {
thread::sleep(time::Duration::from_millis(FAILURE_CASE_SLEEP_MILLIS));
}
let shared_state = SharedState::new();
let client_send = ClientSender {
inner: client_send_,
};
let client_send = ClientSender::new(client_send_);
shared_state.set_running(true, client_send.clone());
let conn = Connection::file(
file_in_name.into(),
Expand Down
18 changes: 7 additions & 11 deletions console_backend/src/connection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,9 +389,7 @@ mod tests {
backup_file(bfilename.clone());
let shared_state = SharedState::new();
let (client_send_, client_receive) = mpsc::channel::<Vec<u8>>();
let client_send = ClientSender {
inner: client_send_,
};
let client_send = ClientSender::new(client_send_);
let connection_state = ConnectionState::new(client_send, shared_state.clone());
let filename = TEST_SHORT_FILEPATH.to_string();
receive_thread(client_receive);
Expand All @@ -405,7 +403,8 @@ mod tests {
DELAY_BEFORE_CHECKING_APP_STARTED_IN_MS,
));
assert!(shared_state.is_running());
sleep(Duration::from_secs_f64(SBP_FILE_SHORT_DURATION_SEC));
// TODO: [CPP-272] Reassess timing on pause unittest for Windows
sleep(Duration::from_secs_f64(SBP_FILE_SHORT_DURATION_SEC + 1.0));
assert!(!shared_state.is_running());
restore_backup_file(bfilename);
}
Expand All @@ -417,9 +416,7 @@ mod tests {
backup_file(bfilename.clone());
let shared_state = SharedState::new();
let (client_send_, client_receive) = mpsc::channel::<Vec<u8>>();
let client_send = ClientSender {
inner: client_send_,
};
let client_send = ClientSender::new(client_send_);
let connection_state = ConnectionState::new(client_send, shared_state.clone());
let filename = TEST_SHORT_FILEPATH.to_string();
receive_thread(client_receive);
Expand All @@ -437,7 +434,8 @@ mod tests {
sleep(Duration::from_secs_f64(SBP_FILE_SHORT_DURATION_SEC));
assert!(shared_state.is_running());
shared_state.set_paused(false);
sleep(Duration::from_secs_f64(SBP_FILE_SHORT_DURATION_SEC));
// TODO: [CPP-272] Reassess timing on pause unittest for Windows
sleep(Duration::from_secs_f64(SBP_FILE_SHORT_DURATION_SEC + 1.0));
assert!(!shared_state.is_running());
restore_backup_file(bfilename);
}
Expand All @@ -449,9 +447,7 @@ mod tests {
backup_file(bfilename.clone());
let shared_state = SharedState::new();
let (client_send_, client_receive) = mpsc::channel::<Vec<u8>>();
let client_send = ClientSender {
inner: client_send_,
};
let client_send = ClientSender::new(client_send_);
let connection_state = ConnectionState::new(client_send.clone(), shared_state.clone());
let filename = TEST_FILEPATH.to_string();
let expected_duration = Duration::from_secs_f64(SERVER_STATE_CONNECTION_LOOP_TIMEOUT_SEC)
Expand Down
Loading