mirrors/ntex
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex.git synced 2025-04-04 13:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

wip

Browse source
This commit is contained in:
Nikolay Kim 2025-03-27 10:20:06 +01:00
parent 24ed090574
commit 0d58e280c2
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ntex-net/src/helpers.rs
View file

@ -49,7 +49,7 @@ async fn connect_inner(
let (sender, rx) = channel(); let (sender, rx) = channel();
crate::rt_impl::connect::ConnectOps::current().connect("-", fd, addr, sender)?; crate::rt_impl::connect::ConnectOps::current().connect(fd, addr, sender)?;
rx.await rx.await
.map_err(|_| io::Error::new(io::ErrorKind::Other, "IO Driver is gone")) .map_err(|_| io::Error::new(io::ErrorKind::Other, "IO Driver is gone"))

10
ntex-net/src/rt_polling/connect.rs
View file

@ -22,7 +22,6 @@ struct ConnectOpsBatcher {
struct Item { struct Item {
fd: RawFd, fd: RawFd,
tag: &'static str,
sender: Sender<io::Result<()>>, sender: Sender<io::Result<()>>,
} }
@ -50,7 +49,6 @@ impl ConnectOps {
pub(crate) fn connect( pub(crate) fn connect(
&self, &self,
tag: &'static str,
fd: RawFd, fd: RawFd,
addr: SockAddr, addr: SockAddr,
sender: Sender<io::Result<()>>, sender: Sender<io::Result<()>>,
@ -61,12 +59,12 @@ impl ConnectOps {
res?; res?;
} }
let item = Item { tag, fd, sender }; let item = Item { fd, sender };
let id = self.0.connects.borrow_mut().insert(item); let id = self.0.connects.borrow_mut().insert(item);
self.0 self.0
.api .api
.attach(tag, fd, id as u32, Some(Event::writable(0))); .attach("-", fd, id as u32, Some(Event::writable(0)));
Ok(id) Ok(id)
} }
} }
@ -97,7 +95,7 @@ impl Handler for ConnectOpsBatcher {
Err(io::Error::from_raw_os_error(err)) Err(io::Error::from_raw_os_error(err))
}; };
self.inner.api.detach(item.tag, item.fd, id as u32); self.inner.api.detach("-", item.fd, id as u32);
let _ = item.sender.send(res); let _ = item.sender.send(res);
} }
} }
@ -109,7 +107,7 @@ impl Handler for ConnectOpsBatcher {
if connects.contains(id) { if connects.contains(id) {
let item = connects.remove(id); let item = connects.remove(id);
let _ = item.sender.send(Err(err)); let _ = item.sender.send(Err(err));
self.inner.api.detach(item.tag, item.fd, id as u32); self.inner.api.detach("-", item.fd, id as u32);
} }
} }
} }

5
ntex-server/src/net/accept.rs
View file

@ -380,7 +380,10 @@ impl Accept {
fn accept(&mut self, token: usize) -> bool { fn accept(&mut self, token: usize) -> bool {
loop { loop {
if let Some(info) = self.sockets.get_mut(token) { if let Some(info) = self.sockets.get_mut(token) {
match info.sock.accept() { let item = info.sock.accept();
println!("------- ACCEPTING {:?}", item);
//match info.sock.accept() {
match item {
Ok(Some(io)) => { Ok(Some(io)) => {
let msg = Connection { let msg = Connection {
io, io,