Skip to content

refactor poll/select/recvfrom syscall #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 10, 2024
Merged

refactor poll/select/recvfrom syscall #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 1 addition & 44 deletions open-coroutine-core/src/syscall/facade.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ use crate::syscall::LinuxSyscall;
use crate::syscall::UnixSyscall;
#[cfg(target_os = "linux")]
use libc::epoll_event;
use libc::{
fd_set, iovec, msghdr, nfds_t, off_t, pollfd, size_t, sockaddr, socklen_t, ssize_t, timeval,
};
use libc::{iovec, msghdr, off_t, size_t, sockaddr, socklen_t, ssize_t};
use once_cell::sync::Lazy;
use std::ffi::{c_int, c_void};

Expand All @@ -23,49 +21,8 @@ cfg_if::cfg_if! {
}
}

/// poll

#[must_use]
pub extern "C" fn poll(
fn_ptr: Option<&extern "C" fn(*mut pollfd, nfds_t, c_int) -> c_int>,
fds: *mut pollfd,
nfds: nfds_t,
timeout: c_int,
) -> c_int {
CHAIN.poll(fn_ptr, fds, nfds, timeout)
}

#[must_use]
pub extern "C" fn select(
fn_ptr: Option<
&extern "C" fn(c_int, *mut fd_set, *mut fd_set, *mut fd_set, *mut timeval) -> c_int,
>,
nfds: c_int,
readfds: *mut fd_set,
writefds: *mut fd_set,
errorfds: *mut fd_set,
timeout: *mut timeval,
) -> c_int {
CHAIN.select(fn_ptr, nfds, readfds, writefds, errorfds, timeout)
}

/// read

#[must_use]
pub extern "C" fn recvfrom(
fn_ptr: Option<
&extern "C" fn(c_int, *mut c_void, size_t, c_int, *mut sockaddr, *mut socklen_t) -> ssize_t,
>,
socket: c_int,
buf: *mut c_void,
len: size_t,
flags: c_int,
addr: *mut sockaddr,
addrlen: *mut socklen_t,
) -> ssize_t {
CHAIN.recvfrom(fn_ptr, socket, buf, len, flags, addr, addrlen)
}

#[must_use]
pub extern "C" fn read(
fn_ptr: Option<&extern "C" fn(c_int, *mut c_void, size_t) -> ssize_t>,
Expand Down
50 changes: 1 addition & 49 deletions open-coroutine-core/src/syscall/io_uring.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
use crate::syscall::LinuxSyscall;
use crate::syscall::UnixSyscall;
use libc::epoll_event;
use libc::{
fd_set, iovec, msghdr, nfds_t, off_t, pollfd, size_t, sockaddr, socklen_t, ssize_t, timeval,
};
use libc::{iovec, msghdr, off_t, size_t, sockaddr, socklen_t, ssize_t};
use std::ffi::{c_int, c_void};

#[derive(Debug, Default)]
Expand All @@ -27,52 +25,6 @@ macro_rules! impl_io_uring {
}

impl<I: UnixSyscall> UnixSyscall for IoUringLinuxSyscall<I> {
extern "C" fn poll(
&self,
fn_ptr: Option<&extern "C" fn(*mut pollfd, nfds_t, c_int) -> c_int>,
fds: *mut pollfd,
nfds: nfds_t,
timeout: c_int,
) -> c_int {
unsupported!(self, poll, fn_ptr, fds, nfds, timeout)
}

extern "C" fn select(
&self,
fn_ptr: Option<
&extern "C" fn(c_int, *mut fd_set, *mut fd_set, *mut fd_set, *mut timeval) -> c_int,
>,
nfds: c_int,
readfds: *mut fd_set,
writefds: *mut fd_set,
errorfds: *mut fd_set,
timeout: *mut timeval,
) -> c_int {
unsupported!(self, select, fn_ptr, nfds, readfds, writefds, errorfds, timeout)
}

extern "C" fn recvfrom(
&self,
fn_ptr: Option<
&extern "C" fn(
c_int,
*mut c_void,
size_t,
c_int,
*mut sockaddr,
*mut socklen_t,
) -> ssize_t,
>,
socket: c_int,
buf: *mut c_void,
len: size_t,
flags: c_int,
addr: *mut sockaddr,
addrlen: *mut socklen_t,
) -> ssize_t {
unsupported!(self, recvfrom, fn_ptr, socket, buf, len, flags, addr, addrlen)
}

extern "C" fn read(
&self,
fn_ptr: Option<&extern "C" fn(c_int, *mut c_void, size_t) -> ssize_t>,
Expand Down
46 changes: 1 addition & 45 deletions open-coroutine-core/src/syscall/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
#[cfg(target_os = "linux")]
use libc::epoll_event;
#[cfg(unix)]
use libc::{
fd_set, iovec, msghdr, nfds_t, off_t, pollfd, size_t, sockaddr, socklen_t, ssize_t, timeval,
};
use libc::{iovec, msghdr, off_t, size_t, sockaddr, socklen_t, ssize_t};
#[cfg(unix)]
use std::ffi::{c_int, c_void};

Expand All @@ -30,50 +28,8 @@ pub use facade::*;

#[cfg(unix)]
pub trait UnixSyscall {
/// poll

extern "C" fn poll(
&self,
fn_ptr: Option<&extern "C" fn(*mut pollfd, nfds_t, c_int) -> c_int>,
fds: *mut pollfd,
nfds: nfds_t,
timeout: c_int,
) -> c_int;

extern "C" fn select(
&self,
fn_ptr: Option<
&extern "C" fn(c_int, *mut fd_set, *mut fd_set, *mut fd_set, *mut timeval) -> c_int,
>,
nfds: c_int,
readfds: *mut fd_set,
writefds: *mut fd_set,
errorfds: *mut fd_set,
timeout: *mut timeval,
) -> c_int;

/// read

extern "C" fn recvfrom(
&self,
fn_ptr: Option<
&extern "C" fn(
c_int,
*mut c_void,
size_t,
c_int,
*mut sockaddr,
*mut socklen_t,
) -> ssize_t,
>,
fd: c_int,
buf: *mut c_void,
len: size_t,
flags: c_int,
addr: *mut sockaddr,
addrlen: *mut socklen_t,
) -> ssize_t;

extern "C" fn read(
&self,
fn_ptr: Option<&extern "C" fn(c_int, *mut c_void, size_t) -> ssize_t>,
Expand Down
123 changes: 2 additions & 121 deletions open-coroutine-core/src/syscall/nio.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ use crate::syscall::LinuxSyscall;
use crate::syscall::UnixSyscall;
#[cfg(target_os = "linux")]
use libc::epoll_event;
use libc::{
fd_set, iovec, msghdr, nfds_t, off_t, pollfd, size_t, sockaddr, socklen_t, ssize_t, timeval,
};
use std::ffi::{c_int, c_uint, c_void};
use libc::{iovec, msghdr, off_t, size_t, sockaddr, socklen_t, ssize_t};
use std::ffi::{c_int, c_void};
use std::time::Duration;

#[derive(Debug, Default)]
Expand Down Expand Up @@ -259,123 +257,6 @@ macro_rules! impl_expected_batch_write_hook {
}

impl<I: UnixSyscall> UnixSyscall for NioLinuxSyscall<I> {
extern "C" fn poll(
&self,
fn_ptr: Option<&extern "C" fn(*mut pollfd, nfds_t, c_int) -> c_int>,
fds: *mut pollfd,
nfds: nfds_t,
timeout: c_int,
) -> c_int {
let mut t = if timeout < 0 { c_int::MAX } else { timeout };
let mut x = 1;
let mut r;
// just check select every x ms
loop {
r = self.inner.poll(fn_ptr, fds, nfds, 0);
if r != 0 || t == 0 {
break;
}
_ = EventLoops::wait_just(Some(Duration::from_millis(t.min(x) as u64)));
if t != c_int::MAX {
t = if t > x { t - x } else { 0 };
}
if x < 16 {
x <<= 1;
}
}
r
}

extern "C" fn select(
&self,
fn_ptr: Option<
&extern "C" fn(c_int, *mut fd_set, *mut fd_set, *mut fd_set, *mut timeval) -> c_int,
>,
nfds: c_int,
readfds: *mut fd_set,
writefds: *mut fd_set,
errorfds: *mut fd_set,
timeout: *mut timeval,
) -> c_int {
let mut t = if timeout.is_null() {
c_uint::MAX
} else {
unsafe { ((*timeout).tv_sec as c_uint) * 1_000_000 + (*timeout).tv_usec as c_uint }
};
let mut o = timeval {
tv_sec: 0,
tv_usec: 0,
};
let mut s: [fd_set; 3] = unsafe { std::mem::zeroed() };
unsafe {
if !readfds.is_null() {
s[0] = *readfds;
}
if !writefds.is_null() {
s[1] = *writefds;
}
if !errorfds.is_null() {
s[2] = *errorfds;
}
}
let mut x = 1;
let mut r;
// just check poll every x ms
loop {
r = self
.inner
.select(fn_ptr, nfds, readfds, writefds, errorfds, &mut o);
if r != 0 || t == 0 {
break;
}
_ = EventLoops::wait_just(Some(Duration::from_millis(u64::from(t.min(x)))));
if t != c_uint::MAX {
t = if t > x { t - x } else { 0 };
}
if x < 16 {
x <<= 1;
}
unsafe {
if !readfds.is_null() {
*readfds = s[0];
}
if !writefds.is_null() {
*writefds = s[1];
}
if !errorfds.is_null() {
*errorfds = s[2];
}
}
o.tv_sec = 0;
o.tv_usec = 0;
}
r
}

extern "C" fn recvfrom(
&self,
fn_ptr: Option<
&extern "C" fn(
c_int,
*mut c_void,
size_t,
c_int,
*mut sockaddr,
*mut socklen_t,
) -> ssize_t,
>,
socket: c_int,
buf: *mut c_void,
len: size_t,
flags: c_int,
addr: *mut sockaddr,
addrlen: *mut socklen_t,
) -> ssize_t {
impl_expected_read_hook!(
self.inner, recvfrom, fn_ptr, socket, buf, len, flags, addr, addrlen
)
}

extern "C" fn read(
&self,
fn_ptr: Option<&extern "C" fn(c_int, *mut c_void, size_t) -> ssize_t>,
Expand Down
Loading