Skip to content

fix(recorder): watchdog 在 sleep 醒来后重检 stop_flag，消除停采误报 #379

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
H-Chris233 merged 1 commit into from
May 9, 2026
Merged

fix(recorder): watchdog 在 sleep 醒来后重检 stop_flag，消除停采误报 #379

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
17 changes: 17 additions & 0 deletions openless-all/app/src-tauri/src/recorder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,23 @@ fn run_audio_thread(
while !stop_flag_for_watchdog.load(Ordering::SeqCst) {
thread::sleep(std::time::Duration::from_millis(WATCHDOG_CHECK_INTERVAL_MS));

// 关键：sleep 醒来后必须重新检查 stop_flag，再去看 elapsed。
//
// 否则会与 hotkey-release 停采路径产生竞态：
// 1. 用户松开 hotkey → end_session 调 rec.stop() → 设置 stop_flag
// → audio 线程 pause 了 cpal Stream → 回调真的静默
// 2. 但 watchdog 此时正卡在上面的 1 秒 sleep 里
// 3. sleep 结束后，若不重新检查 stop_flag，
// 就会读到 last_callback_time 已经"老 4 秒"，
// 把"我们主动停掉的录音"错报成 EngineFailed("录音回调静默停止 N 秒")，
// coordinator 收到错误后会终止 session、胶囊弹错。
//
// 修复方式是 sleep 后立即再 load 一次：进入 stop 流程后 watchdog 静默退出，
// 不影响 watchdog 在真正活动期捕获 CoreAudio 设备掉线等真故障。
if stop_flag_for_watchdog.load(Ordering::SeqCst) {
break;
}

let last_callback = *state_for_watchdog.last_callback_time.lock();
match last_callback {
Some(last_time) => {
Expand Down
Loading