Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-08 21:06:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement (un)register_observer for TCP/UDP

Browse Source
This commit is contained in:
Ruihan Li 2024-01-08 23:35:29 +08:00 committed by Tate, Hongliang Tian
parent 29ebf8e60c
commit 8628543067
8 changed files with 82 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kernel/aster-nix/src/net/socket/ip/datagram/mod.rs
View File

@ -210,6 +210,24 @@ impl FileLike for DatagramSocket {
}
Ok(())
}
fn register_observer(
&self,
observer: Weak<dyn Observer<IoEvents>>,
mask: IoEvents,
) -> Result<()> {
self.pollee.register_observer(observer, mask);
Ok(())
}
fn unregister_observer(
&self,
observer: &Weak<dyn Observer<IoEvents>>,
) -> Result<Weak<dyn Observer<IoEvents>>> {
self.pollee
.unregister_observer(observer)
.ok_or_else(|| Error::with_message(Errno::ENOENT, "observer is not registered"))
}
}
impl Socket for DatagramSocket {

20
kernel/aster-nix/src/net/socket/ip/stream/connected.rs
View File

@ -78,26 +78,6 @@ impl ConnectedStream {
self.update_io_events(pollee);
}
pub fn register_observer(
&self,
pollee: &Pollee,
observer: Weak<dyn Observer<IoEvents>>,
mask: IoEvents,
) -> Result<()> {
pollee.register_observer(observer, mask);
Ok(())
}
pub fn unregister_observer(
&self,
pollee: &Pollee,
observer: &Weak<dyn Observer<IoEvents>>,
) -> Result<Weak<dyn Observer<IoEvents>>> {
pollee
.unregister_observer(observer)
.ok_or_else(|| Error::with_message(Errno::EINVAL, "fails to unregister observer"))
}
pub(super) fn update_io_events(&self, pollee: &Pollee) {
self.bound_socket.raw_with(|socket: &mut RawTcpSocket| {
if socket.can_recv() {

22
kernel/aster-nix/src/net/socket/ip/stream/connecting.rs
View File

@ -2,7 +2,7 @@
use super::{connected::ConnectedStream, init::InitStream};
use crate::{
events::{IoEvents, Observer},
events::IoEvents,
net::iface::{AnyBoundSocket, IpEndpoint, RawTcpSocket},
prelude::*,
process::signal::Pollee,
@ -71,26 +71,6 @@ impl ConnectingStream {
self.update_io_events(pollee);
}
pub fn register_observer(
&self,
pollee: &Pollee,
observer: Weak<dyn Observer<IoEvents>>,
mask: IoEvents,
) -> Result<()> {
pollee.register_observer(observer, mask);
Ok(())
}
pub fn unregister_observer(
&self,
pollee: &Pollee,
observer: &Weak<dyn Observer<IoEvents>>,
) -> Result<Weak<dyn Observer<IoEvents>>> {
pollee
.unregister_observer(observer)
.ok_or_else(|| Error::with_message(Errno::EINVAL, "fails to unregister observer"))
}
pub(super) fn update_io_events(&self, pollee: &Pollee) {
if self.conn_result.read().is_some() {
return;

23
kernel/aster-nix/src/net/socket/ip/stream/init.rs
View File

@ -4,13 +4,12 @@ use alloc::sync::Weak;
use super::{connecting::ConnectingStream, listen::ListenStream};
use crate::{
events::{IoEvents, Observer},
events::Observer,
net::{
iface::{AnyBoundSocket, AnyUnboundSocket, IpEndpoint},
socket::ip::common::{bind_socket, get_ephemeral_endpoint},
},
prelude::*,
process::signal::Pollee,
};
pub enum InitStream {
@ -92,24 +91,4 @@ impl InitStream {
InitStream::Bound(bound_socket) => Some(bound_socket.local_endpoint().unwrap()),
}
}
pub fn register_observer(
&self,
pollee: &Pollee,
observer: Weak<dyn Observer<IoEvents>>,
mask: IoEvents,
) -> Result<()> {
pollee.register_observer(observer, mask);
Ok(())
}
pub fn unregister_observer(
&self,
pollee: &Pollee,
observer: &Weak<dyn Observer<IoEvents>>,
) -> Result<Weak<dyn Observer<IoEvents>>> {
pollee
.unregister_observer(observer)
.ok_or_else(|| Error::with_message(Errno::EINVAL, "fails to unregister observer"))
}
}

22
kernel/aster-nix/src/net/socket/ip/stream/listen.rs
View File

@ -3,7 +3,7 @@ use smoltcp::socket::tcp::ListenError;
use super::connected::ConnectedStream;
use crate::{
events::{IoEvents, Observer},
events::IoEvents,
net::iface::{AnyBoundSocket, AnyUnboundSocket, BindPortConfig, IpEndpoint, RawTcpSocket},
prelude::*,
process::signal::Pollee,
@ -95,26 +95,6 @@ impl ListenStream {
pollee.del_events(IoEvents::IN);
}
}
pub fn register_observer(
&self,
pollee: &Pollee,
observer: Weak<dyn Observer<IoEvents>>,
mask: IoEvents,
) -> Result<()> {
pollee.register_observer(observer, mask);
Ok(())
}
pub fn unregister_observer(
&self,
pollee: &Pollee,
observer: &Weak<dyn Observer<IoEvents>>,
) -> Result<Weak<dyn Observer<IoEvents>>> {
pollee
.unregister_observer(observer)
.ok_or_else(|| Error::with_message(Errno::EINVAL, "fails to unregister observer"))
}
}
struct BacklogSocket {

28
kernel/aster-nix/src/net/socket/ip/stream/mod.rs
View File

@ -296,32 +296,20 @@ impl FileLike for StreamSocket {
fn register_observer(
&self,
observer: Weak<dyn crate::events::Observer<IoEvents>>,
observer: Weak<dyn Observer<IoEvents>>,
mask: IoEvents,
) -> Result<()> {
let state = self.state.read();
match state.as_ref() {
State::Init(init) => init.register_observer(&self.pollee, observer, mask),
State::Connecting(connecting) => {
connecting.register_observer(&self.pollee, observer, mask)
}
State::Connected(connected) => {
connected.register_observer(&self.pollee, observer, mask)
}
State::Listen(listen) => listen.register_observer(&self.pollee, observer, mask),
}
self.pollee.register_observer(observer, mask);
Ok(())
}
fn unregister_observer(
&self,
observer: &Weak<dyn crate::events::Observer<IoEvents>>,
) -> Result<Weak<dyn crate::events::Observer<IoEvents>>> {
match self.state.read().as_ref() {
State::Init(init) => init.unregister_observer(&self.pollee, observer),
State::Connecting(connecting) => connecting.unregister_observer(&self.pollee, observer),
State::Connected(connected) => connected.unregister_observer(&self.pollee, observer),
State::Listen(listen) => listen.unregister_observer(&self.pollee, observer),
}
observer: &Weak<dyn Observer<IoEvents>>,
) -> Result<Weak<dyn Observer<IoEvents>>> {
self.pollee
.unregister_observer(observer)
.ok_or_else(|| Error::with_message(Errno::ENOENT, "observer is not registered"))
}
}

37
regression/apps/network/tcp_err.c
View File

@ -3,6 +3,7 @@
#include <unistd.h>
#include <sys/signal.h>
#include <sys/socket.h>
#include <sys/poll.h>
#include <netinet/in.h>
#include <arpa/inet.h>
@ -70,11 +71,12 @@ FN_SETUP(accpected)
{
struct sockaddr addr;
socklen_t addrlen = sizeof(addr);
struct pollfd pfd = { .fd = sk_listen, .events = POLLIN };
do {
sk_accepted = CHECK_WITH(accept(sk_listen, &addr, &addrlen),
_ret >= 0 || errno == EAGAIN);
} while (sk_accepted < 0);
CHECK_WITH(poll(&pfd, 1, 1000),
_ret >= 0 && ((pfd.revents & (POLLIN | POLLOUT)) & POLLIN));
sk_accepted = CHECK(accept(sk_listen, &addr, &addrlen));
}
END_SETUP()
@ -226,3 +228,30 @@ FN_TEST(accept)
TEST_ERRNO(accept(sk_accepted, psaddr, &addrlen), EINVAL);
}
END_TEST()
FN_TEST(poll)
{
struct pollfd pfd = { .events = POLLIN | POLLOUT };
pfd.fd = sk_unbound;
// FIXME: Uncomment this
// TEST_RES(poll(&pfd, 1, 0),
// (pfd.revents & (POLLIN | POLLOUT)) == POLLOUT);
pfd.fd = sk_bound;
// FIXME: Uncomment this
// TEST_RES(poll(&pfd, 1, 0),
// (pfd.revents & (POLLIN | POLLOUT)) == POLLOUT);
pfd.fd = sk_listen;
TEST_RES(poll(&pfd, 1, 0), (pfd.revents & (POLLIN | POLLOUT)) == 0);
pfd.fd = sk_connected;
TEST_RES(poll(&pfd, 1, 0),
(pfd.revents & (POLLIN | POLLOUT)) == POLLOUT);
pfd.fd = sk_accepted;
TEST_RES(poll(&pfd, 1, 0),
(pfd.revents & (POLLIN | POLLOUT)) == POLLOUT);
}
END_TEST()

20
regression/apps/network/udp_err.c
View File

@ -3,6 +3,7 @@
#include <unistd.h>
#include <sys/signal.h>
#include <sys/socket.h>
#include <sys/poll.h>
#include <netinet/in.h>
#include <arpa/inet.h>
@ -170,3 +171,22 @@ FN_TEST(accept)
TEST_ERRNO(accept(sk_connected, psaddr, &addrlen), EOPNOTSUPP);
}
END_TEST()
FN_TEST(poll)
{
struct pollfd pfd = { .events = POLLIN | POLLOUT };
pfd.fd = sk_unbound;
// FIXME: Uncomment this
// TEST_RES(poll(&pfd, 1, 0),
// (pfd.revents & (POLLIN | POLLOUT)) == POLLOUT);
pfd.fd = sk_bound;
TEST_RES(poll(&pfd, 1, 0),
(pfd.revents & (POLLIN | POLLOUT)) == POLLOUT);
pfd.fd = sk_connected;
TEST_RES(poll(&pfd, 1, 0),
(pfd.revents & (POLLIN | POLLOUT)) == POLLOUT);
}
END_TEST()