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

NIT

Browse Source
This commit is contained in:
jif-oai
2025-12-17 18:16:19 +00:00
parent ad39b7ea72
commit dfdf696062
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
codex-rs/utils/pty/src/fallback.rs
View File

@@ -78,8 +78,10 @@ pub async fn spawn_piped_process(
let wait_child = Arc::clone(&child);
let wait_handle: JoinHandle<()> = tokio::task::spawn_blocking(move || {
let code = loop {
let mut guard = wait_child.blocking_lock();
let status = guard.try_wait();
let status = {
let mut guard = wait_child.blocking_lock();
guard.try_wait()
};
match status {
Ok(Some(status)) => {
break status
@@ -149,8 +151,16 @@ impl PipedChildKiller {
impl portable_pty::ChildKiller for PipedChildKiller {
fn kill(&mut self) -> io::Result<()> {
let mut guard = self.child.blocking_lock();
guard.kill()
if let Ok(mut guard) = self.child.try_lock() {
return guard.kill();
}
let child = Arc::clone(&self.child);
std::thread::spawn(move || {
let mut guard = child.blocking_lock();
let _ = guard.kill();
});
Ok(())
}
fn clone_killer(&self) -> Box<dyn portable_pty::ChildKiller + Send + Sync> {