forked from M-Labs/zynq-rs
libasync: refactor listen() into accept()+listen() with a backlog
This commit is contained in:
parent
ab1404488c
commit
90e9a7db02
|
@ -203,46 +203,40 @@ pub fn main_core0() {
|
||||||
Sockets::init(32);
|
Sockets::init(32);
|
||||||
/// `chargen`
|
/// `chargen`
|
||||||
const TCP_PORT: u16 = 19;
|
const TCP_PORT: u16 = 19;
|
||||||
async fn handle_connection(socket: TcpStream) -> smoltcp::Result<()> {
|
async fn handle_connection(stream: TcpStream) -> smoltcp::Result<()> {
|
||||||
socket.send("Enter your name: ".bytes()).await?;
|
stream.send("Enter your name: ".bytes()).await?;
|
||||||
let name = socket.recv(|buf| {
|
let name = stream.recv(|buf| {
|
||||||
|
for (i, b) in buf.iter().enumerate() {
|
||||||
|
if *b == '\n' as u8 {
|
||||||
|
return match core::str::from_utf8(&buf[0..i]) {
|
||||||
|
Ok(name) =>
|
||||||
|
Poll::Ready((i + 1, Some(name.to_owned()))),
|
||||||
|
Err(_) =>
|
||||||
|
Poll::Ready((i + 1, None))
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
if buf.len() > 100 {
|
if buf.len() > 100 {
|
||||||
// Too much input, consume all
|
// Too much input, consume all
|
||||||
Poll::Ready((buf.len(), None))
|
Poll::Ready((buf.len(), None))
|
||||||
} else {
|
} else {
|
||||||
for (i, b) in buf.iter().enumerate() {
|
|
||||||
if *b == '\n' as u8 {
|
|
||||||
return match core::str::from_utf8(&buf[0..i]) {
|
|
||||||
Ok(name) =>
|
|
||||||
Poll::Ready((i + 1, Some(name.to_owned()))),
|
|
||||||
Err(_) =>
|
|
||||||
Poll::Ready((i + 1, None))
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Poll::Pending
|
Poll::Pending
|
||||||
}
|
}
|
||||||
}).await?;
|
}).await?;
|
||||||
match name {
|
match name {
|
||||||
Some(name) =>
|
Some(name) =>
|
||||||
socket.send(format!("Hello {}!\n", name).bytes()).await?,
|
stream.send(format!("Hello {}!\n", name).bytes()).await?,
|
||||||
None =>
|
None =>
|
||||||
socket.send("I had trouble reading your name.\n".bytes()).await?,
|
stream.send("I had trouble reading your name.\n".bytes()).await?,
|
||||||
}
|
}
|
||||||
socket.flush().await;
|
stream.flush().await;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
task::spawn(async {
|
TcpStream::listen(TCP_PORT, 2048, 2048, 8, |stream| async {
|
||||||
println!("listening");
|
handle_connection(stream)
|
||||||
while let socket = TcpStream::listen(TCP_PORT, 2048, 2048).await {
|
.await
|
||||||
task::spawn(async {
|
.map_err(|e| println!("Connection: {:?}", e));
|
||||||
handle_connection(socket)
|
|
||||||
.await
|
|
||||||
.map_err(|e| println!("Connection: {:?}", e));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
println!("done?");
|
|
||||||
});
|
});
|
||||||
|
|
||||||
Sockets::run(&mut iface);
|
Sockets::run(&mut iface);
|
||||||
|
|
|
@ -7,13 +7,14 @@ use core::{
|
||||||
pin::Pin,
|
pin::Pin,
|
||||||
task::{Context, Poll},
|
task::{Context, Poll},
|
||||||
};
|
};
|
||||||
use alloc::vec;
|
use alloc::{boxed::Box, vec, vec::Vec};
|
||||||
use smoltcp::{
|
use smoltcp::{
|
||||||
socket::{
|
socket::{
|
||||||
SocketHandle, SocketRef,
|
SocketHandle, SocketRef,
|
||||||
TcpSocketBuffer, TcpSocket,
|
TcpSocketBuffer, TcpSocket,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
use crate::task;
|
||||||
use super::Sockets;
|
use super::Sockets;
|
||||||
|
|
||||||
/// References a smoltcp TcpSocket
|
/// References a smoltcp TcpSocket
|
||||||
|
@ -65,9 +66,33 @@ impl TcpStream {
|
||||||
f(socket_ref)
|
f(socket_ref)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Spawns `backlog` tasks with listening sockets so that more
|
||||||
|
/// connections can be accepted while some are still
|
||||||
|
/// handshaking. Spawns additional tasks for each connection.
|
||||||
|
pub fn listen<F, R, T>(port: u16, rx_bufsize: usize, tx_bufsize: usize, backlog: usize, f: F)
|
||||||
|
where
|
||||||
|
F: Fn(Self) -> R + Copy + 'static,
|
||||||
|
R: Future<Output = T> + 'static,
|
||||||
|
{
|
||||||
|
for _ in 0..backlog {
|
||||||
|
task::spawn(async move {
|
||||||
|
loop {
|
||||||
|
// Wait for new connection
|
||||||
|
let stream = TcpStream::accept(port, rx_bufsize, tx_bufsize).await;
|
||||||
|
// Spawn async task for new connection
|
||||||
|
task::spawn(f(stream));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Listen for the next incoming connection on a TCP
|
/// Listen for the next incoming connection on a TCP
|
||||||
/// port. Succeeds on connection attempt.
|
/// port. Succeeds on connection attempt.
|
||||||
pub async fn listen(port: u16, rx_bufsize: usize, tx_bufsize: usize) -> Self {
|
///
|
||||||
|
/// Calling this serially in a loop will cause slow/botched
|
||||||
|
/// connection attempts stall any more new connections. Use
|
||||||
|
/// `listen()` with a backlog instead.
|
||||||
|
pub async fn accept(port: u16, rx_bufsize: usize, tx_bufsize: usize) -> Self {
|
||||||
struct Accept {
|
struct Accept {
|
||||||
stream: Option<TcpStream>,
|
stream: Option<TcpStream>,
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue