fix: keep virtual USB responsive under bulk OUT backpressure

This commit is contained in:
tongtong committed 2026-11-13 02:35:00 +08:00
1 parent a339465392
commit 5aa575f182
3 files changed
+37 -4

No files matched your search

+20 -4
View File
@@ -188,7 +188,8 @@ async fn imported(socket: TcpStream, target: SocketAddr, serial: &str) -> Result
let mut tasks = JoinSet::new();
tasks.spawn(read_requests(read, tx));
let (data_tx, mut data_rx) = mpsc::channel(16);
let mut backend: Option<OwnedWriteHalf> = None;
let mut backend: Option<mpsc::Sender<Request>> = None;
let (completed_tx, mut completed_rx) = mpsc::channel::<Request>(32);
let mut pending: VecDeque<Request> = VecDeque::new();
let mut bytes: VecDeque<Vec<u8>> = VecDeque::new();
let mut offset = 0;
@@ -223,18 +224,33 @@ async fn imported(socket: TcpStream, target: SocketAddr, serial: &str) -> Result
if size==0{reply(&mut write,&request,0,&[],0).await?;continue}
if backend.is_none(){
let socket=timeout(Duration::from_secs(10),TcpStream::connect(target)).await??;socket.set_nodelay(true)?;
let(read,write)=socket.into_split();backend=Some(write);
let(read,mut writer)=socket.into_split();
let(out_tx,mut out_rx)=mpsc::channel::<Request>(32);
backend=Some(out_tx);
let completed=completed_tx.clone();
// OUT may block on network backpressure. Keep IN completions and
// control/unlink requests serviced while the remote drains it.
tasks.spawn(async move {
while let Some(request)=out_rx.recv().await {
timeout(IO,writer.write_all(&request.data)).await.context("ADB bulk OUT timed out")??;
completed.send(request).await.context("USB completion queue closed")?;
}
Ok(())
});
tasks.spawn(read_adb(read,data_tx.clone()));
}
if direction==0{
timeout(IO,backend.as_mut().unwrap().write_all(&request.data)).await??;
reply(&mut write,&request,0,&[],request.data.len()).await?;
backend.as_ref().unwrap().try_send(request).context("USB bulk OUT queue full or closed")?;
}else{
if pending.len()>=64{bail!("too many pending bulk reads")}
pending.push_back(request);
}
}else{reply(&mut write,&request,-32,&[],0).await?;}
},
completed=completed_rx.recv()=>{
let request=completed.context("USB bulk OUT completion queue closed")?;
reply(&mut write,&request,0,&[],request.data.len()).await?;
},
data=data_rx.recv(),if bytes.len()<16=>{bytes.push_back(data.context("ADB disconnected")?);},
result=tasks.join_next()=>{return result.context("USB worker missing")?.context("USB worker failed")?;},
}