clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 14:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

V10

Browse Source
This commit is contained in:
jimmyfraiture
2025-09-07 18:43:54 -07:00
parent c4c673164e
commit 95eeb3d1a1
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
codex-rs/core/src/unified_exec/mod.rs
View File

@@ -208,10 +208,15 @@ impl UnifiedExecSessionManager {
let deadline = start + Duration::from_millis(timeout_ms);
loop {
let drained_chunks = {
let drained_chunks;
let mut wait_for_output = None;
{
let mut guard = output_buffer.lock().await;
guard.drain()
};
drained_chunks = guard.drain();
if drained_chunks.is_empty() {
wait_for_output = Some(output_notify.notified());
}
}
if drained_chunks.is_empty() {
if Instant::now() >= deadline {
@@ -219,18 +224,21 @@ impl UnifiedExecSessionManager {
}
let remaining = deadline.saturating_duration_since(Instant::now());
let notified = wait_for_output.unwrap_or_else(|| output_notify.notified());
tokio::pin!(notified);
tokio::select! {
_ = output_notify.notified() => {}
_ = &mut notified => {}
_ = tokio::time::sleep(remaining) => break,
}
} else {
for chunk in drained_chunks {
collected.extend_from_slice(&chunk);
}
continue;
}
if Instant::now() >= deadline {
break;
}
for chunk in drained_chunks {
collected.extend_from_slice(&chunk);
}
if Instant::now() >= deadline {
break;
}
}