fix(app): propagate CZ_TARGET_DEVICE to czcamera_core and keep reap_mutex_ across child_pid_ clear

This commit is contained in:
2026-11-19 14:03:05 -05:00
parent 4304cb259d
commit 3c4a870e70
3 changed files with 20 additions and 4 deletions

View File

@@ -1111,8 +1111,9 @@ void SubprocessCameraBackend::stdout_reader_loop(int stdout_fd,
std::string reason = "czcamera-cam stdout closed unexpectedly";
bool reaped_in_reader = false;
std::unique_lock<std::mutex> reap_lock(reap_mutex_, std::defer_lock);
if (!was_stopping && pid > 0) {
std::lock_guard<std::mutex> reap_lock(reap_mutex_);
reap_lock.lock();
bool still_ours = false;
{
std::lock_guard<std::mutex> st_lock(state_mutex_);
@@ -1129,6 +1130,8 @@ void SubprocessCameraBackend::stdout_reader_loop(int stdout_fd,
}
}
// Keep reap_lock held while clearing child_pid_ under state_mutex_
// (maintains lock order reap_mutex_ -> state_mutex_ matching stop_locked).
std::lock_guard<std::mutex> st_lock(state_mutex_);
if (reaped_in_reader && child_pid_ == pid) {
child_pid_ = -1;