Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,5 @@ num_cpus = "1"
uuid = "1"
tempfile = "3"
cc = "1"
syn = "2"
syn = "3"
quote = "1"
91 changes: 48 additions & 43 deletions core/src/coroutine/listener.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ pub trait Listener<Yield, Return>: Debug {
}

macro_rules! broadcast {
($impl_method_name: ident($($arg: ident : $arg_type: ty),*), $method_name:expr) => {
($impl_method_name: ident($($arg: ident : $arg_type: ty),* $(,)?), $method_name:expr) => {
fn $impl_method_name(&self, $($arg: $arg_type),*) {
for listener in &self.listeners {
_ = $crate::catch!(
Expand All @@ -68,46 +68,51 @@ where
Yield: Debug + Copy,
Return: Debug + Copy,
{
broadcast!(on_state_changed(
local: &CoroutineLocal,
old_state: CoroutineState<Yield, Return>,
new_state: CoroutineState<Yield, Return>
), "on_state_changed");

broadcast!(on_ready(
local: &CoroutineLocal,
old_state: CoroutineState<Yield, Return>
), "on_ready");

broadcast!(on_running(
local: &CoroutineLocal,
old_state: CoroutineState<Yield, Return>
), "on_running");

broadcast!(on_suspend(
local: &CoroutineLocal,
old_state: CoroutineState<Yield, Return>
), "on_suspend");

broadcast!(on_syscall(
local: &CoroutineLocal,
old_state: CoroutineState<Yield, Return>
), "on_syscall");

broadcast!(on_cancel(
local: &CoroutineLocal,
old_state: CoroutineState<Yield, Return>
), "on_cancel");

broadcast!(on_complete(
local: &CoroutineLocal,
old_state: CoroutineState<Yield, Return>,
result: Return
), "on_complete");

broadcast!(on_error(
local: &CoroutineLocal,
old_state: CoroutineState<Yield, Return>,
message: &str
), "on_error");
broadcast!(
on_state_changed(
local: &CoroutineLocal,
old_state: CoroutineState<Yield, Return>,
new_state: CoroutineState<Yield, Return>,
),
"on_state_changed"
);

broadcast!(
on_ready(local: &CoroutineLocal, old_state: CoroutineState<Yield, Return>),
"on_ready"
);

broadcast!(
on_running(local: &CoroutineLocal, old_state: CoroutineState<Yield, Return>),
"on_running"
);

broadcast!(
on_suspend(local: &CoroutineLocal, old_state: CoroutineState<Yield, Return>),
"on_suspend"
);

broadcast!(
on_syscall(local: &CoroutineLocal, old_state: CoroutineState<Yield, Return>),
"on_syscall"
);

broadcast!(
on_cancel(local: &CoroutineLocal, old_state: CoroutineState<Yield, Return>),
"on_cancel"
);

broadcast!(
on_complete(
local: &CoroutineLocal,
old_state: CoroutineState<Yield, Return>,
result: Return,
),
"on_complete"
);

broadcast!(
on_error(local: &CoroutineLocal, old_state: CoroutineState<Yield, Return>, message: &str),
"on_error"
);
}
58 changes: 51 additions & 7 deletions core/src/net/event_loop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ impl_current_for!(EVENT_LOOP, EventLoop<'e>);
impl_display_by_debug!(EventLoop<'e>);

macro_rules! impl_io_uring {
( $syscall: ident($($arg: ident : $arg_type: ty),*) -> $result: ty ) => {
( $syscall: ident($($arg: ident : $arg_type: ty),* $(,)?) -> $result: ty ) => {
#[cfg(all(target_os = "linux", feature = "io_uring"))]
impl EventLoop<'_> {
pub(super) fn $syscall(
Expand Down Expand Up @@ -526,19 +526,43 @@ impl_io_uring!(readv(fd: c_int, iov: *const iovec, iovcnt: c_int) -> ssize_t);
impl_io_uring!(preadv(fd: c_int, iov: *const iovec, iovcnt: c_int, offset: off_t) -> ssize_t);
impl_io_uring!(recvmsg(fd: c_int, msg: *mut msghdr, flags: c_int) -> ssize_t);
impl_io_uring!(send(fd: c_int, buf: *const c_void, len: size_t, flags: c_int) -> ssize_t);
impl_io_uring!(sendto(fd: c_int, buf: *const c_void, len: size_t, flags: c_int, addr: *const sockaddr, addrlen: socklen_t) -> ssize_t);
impl_io_uring!(
sendto(
fd: c_int,
buf: *const c_void,
len: size_t,
flags: c_int,
addr: *const sockaddr,
addrlen: socklen_t,
) -> ssize_t
);
impl_io_uring!(write(fd: c_int, buf: *const c_void, count: size_t) -> ssize_t);
impl_io_uring!(pwrite(fd: c_int, buf: *const c_void, count: size_t, offset: off_t) -> ssize_t);
impl_io_uring!(writev(fd: c_int, iov: *const iovec, iovcnt: c_int) -> ssize_t);
impl_io_uring!(pwritev(fd: c_int, iov: *const iovec, iovcnt: c_int, offset: off_t) -> ssize_t);
impl_io_uring!(sendmsg(fd: c_int, msg: *const msghdr, flags: c_int) -> ssize_t);
impl_io_uring!(fsync(fd: c_int) -> c_int);
impl_io_uring!(mkdirat(dirfd: c_int, pathname: *const c_char, mode: mode_t) -> c_int);
impl_io_uring!(renameat(olddirfd: c_int, oldpath: *const c_char, newdirfd: c_int, newpath: *const c_char) -> c_int);
impl_io_uring!(renameat2(olddirfd: c_int, oldpath: *const c_char, newdirfd: c_int, newpath: *const c_char, flags: c_uint) -> c_int);
impl_io_uring!(
renameat(
olddirfd: c_int,
oldpath: *const c_char,
newdirfd: c_int,
newpath: *const c_char,
) -> c_int
);
impl_io_uring!(
renameat2(
olddirfd: c_int,
oldpath: *const c_char,
newdirfd: c_int,
newpath: *const c_char,
flags: c_uint,
) -> c_int
);

macro_rules! impl_iocp {
( $syscall: ident($($arg: ident : $arg_type: ty),*) -> $result: ty ) => {
( $syscall: ident($($arg: ident : $arg_type: ty),* $(,)?) -> $result: ty ) => {
#[cfg(all(windows, feature = "iocp"))]
impl EventLoop<'_> {
#[allow(non_snake_case, clippy::too_many_arguments)]
Expand All @@ -561,9 +585,29 @@ macro_rules! impl_iocp {

impl_iocp!(accept(fd: SOCKET, addr: *mut SOCKADDR, len: *mut c_int) -> c_int);
impl_iocp!(recv(fd: SOCKET, buf: PSTR, len: c_int, flags: SEND_RECV_FLAGS) -> c_int);
impl_iocp!(WSARecv(fd: SOCKET, buf: *const WSABUF, dwbuffercount: c_uint, lpnumberofbytesrecvd: *mut c_uint, lpflags : *mut c_uint, lpoverlapped: *mut OVERLAPPED, lpcompletionroutine : LPWSAOVERLAPPED_COMPLETION_ROUTINE) -> c_int);
impl_iocp!(
WSARecv(
fd: SOCKET,
buf: *const WSABUF,
dwbuffercount: c_uint,
lpnumberofbytesrecvd: *mut c_uint,
lpflags: *mut c_uint,
lpoverlapped: *mut OVERLAPPED,
lpcompletionroutine: LPWSAOVERLAPPED_COMPLETION_ROUTINE,
) -> c_int
);
impl_iocp!(send(fd: SOCKET, buf: PCSTR, len: c_int, flags: SEND_RECV_FLAGS) -> c_int);
impl_iocp!(WSASend(fd: SOCKET, buf: *const WSABUF, dwbuffercount: c_uint, lpnumberofbytesrecvd: *mut c_uint, dwflags : c_uint, lpoverlapped: *mut OVERLAPPED, lpcompletionroutine : LPWSAOVERLAPPED_COMPLETION_ROUTINE) -> c_int);
impl_iocp!(
WSASend(
fd: SOCKET,
buf: *const WSABUF,
dwbuffercount: c_uint,
lpnumberofbytesrecvd: *mut c_uint,
dwflags: c_uint,
lpoverlapped: *mut OVERLAPPED,
lpcompletionroutine: LPWSAOVERLAPPED_COMPLETION_ROUTINE,
) -> c_int
);

#[cfg(all(test, not(feature = "preemptive")))]
mod tests {
Expand Down
58 changes: 51 additions & 7 deletions core/src/net/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ impl EventLoops {
}

macro_rules! impl_io_uring {
( $syscall: ident($($arg: ident: $arg_type: ty),*) -> $result: ty ) => {
( $syscall: ident($($arg: ident: $arg_type: ty),* $(,)?) -> $result: ty ) => {
#[cfg(all(target_os = "linux", feature = "io_uring"))]
impl EventLoops {
#[allow(missing_docs)]
Expand All @@ -289,19 +289,43 @@ impl_io_uring!(readv(fd: c_int, iov: *const iovec, iovcnt: c_int) -> ssize_t);
impl_io_uring!(preadv(fd: c_int, iov: *const iovec, iovcnt: c_int, offset: off_t) -> ssize_t);
impl_io_uring!(recvmsg(fd: c_int, msg: *mut msghdr, flags: c_int) -> ssize_t);
impl_io_uring!(send(fd: c_int, buf: *const c_void, len: size_t, flags: c_int) -> ssize_t);
impl_io_uring!(sendto(fd: c_int, buf: *const c_void, len: size_t, flags: c_int, addr: *const sockaddr, addrlen: socklen_t) -> ssize_t);
impl_io_uring!(
sendto(
fd: c_int,
buf: *const c_void,
len: size_t,
flags: c_int,
addr: *const sockaddr,
addrlen: socklen_t,
) -> ssize_t
);
impl_io_uring!(write(fd: c_int, buf: *const c_void, count: size_t) -> ssize_t);
impl_io_uring!(pwrite(fd: c_int, buf: *const c_void, count: size_t, offset: off_t) -> ssize_t);
impl_io_uring!(writev(fd: c_int, iov: *const iovec, iovcnt: c_int) -> ssize_t);
impl_io_uring!(pwritev(fd: c_int, iov: *const iovec, iovcnt: c_int, offset: off_t) -> ssize_t);
impl_io_uring!(sendmsg(fd: c_int, msg: *const msghdr, flags: c_int) -> ssize_t);
impl_io_uring!(fsync(fd: c_int) -> c_int);
impl_io_uring!(mkdirat(dirfd: c_int, pathname: *const c_char, mode: mode_t) -> c_int);
impl_io_uring!(renameat(olddirfd: c_int, oldpath: *const c_char, newdirfd: c_int, newpath: *const c_char) -> c_int);
impl_io_uring!(renameat2(olddirfd: c_int, oldpath: *const c_char, newdirfd: c_int, newpath: *const c_char, flags: c_uint) -> c_int);
impl_io_uring!(
renameat(
olddirfd: c_int,
oldpath: *const c_char,
newdirfd: c_int,
newpath: *const c_char,
) -> c_int
);
impl_io_uring!(
renameat2(
olddirfd: c_int,
oldpath: *const c_char,
newdirfd: c_int,
newpath: *const c_char,
flags: c_uint,
) -> c_int
);

macro_rules! impl_iocp {
( $syscall: ident($($arg: ident : $arg_type: ty),*) -> $result: ty ) => {
( $syscall: ident($($arg: ident : $arg_type: ty),* $(,)?) -> $result: ty ) => {
#[allow(non_snake_case)]
#[cfg(all(windows, feature = "iocp"))]
impl EventLoops {
Expand All @@ -317,6 +341,26 @@ macro_rules! impl_iocp {

impl_iocp!(accept(fd: SOCKET, addr: *mut SOCKADDR, len: *mut c_int) -> c_int);
impl_iocp!(recv(fd: SOCKET, buf: PSTR, len: c_int, flags: SEND_RECV_FLAGS) -> c_int);
impl_iocp!(WSARecv(fd: SOCKET, buf: *const WSABUF, dwbuffercount: c_uint, lpnumberofbytesrecvd: *mut c_uint, lpflags : *mut c_uint, lpoverlapped: *mut OVERLAPPED, lpcompletionroutine : LPWSAOVERLAPPED_COMPLETION_ROUTINE) -> c_int);
impl_iocp!(
WSARecv(
fd: SOCKET,
buf: *const WSABUF,
dwbuffercount: c_uint,
lpnumberofbytesrecvd: *mut c_uint,
lpflags: *mut c_uint,
lpoverlapped: *mut OVERLAPPED,
lpcompletionroutine: LPWSAOVERLAPPED_COMPLETION_ROUTINE,
) -> c_int
);
impl_iocp!(send(fd: SOCKET, buf: PCSTR, len: c_int, flags: SEND_RECV_FLAGS) -> c_int);
impl_iocp!(WSASend(fd: SOCKET, buf: *const WSABUF, dwbuffercount: c_uint, lpnumberofbytesrecvd: *mut c_uint, dwflags : c_uint, lpoverlapped: *mut OVERLAPPED, lpcompletionroutine : LPWSAOVERLAPPED_COMPLETION_ROUTINE) -> c_int);
impl_iocp!(
WSASend(
fd: SOCKET,
buf: *const WSABUF,
dwbuffercount: c_uint,
lpnumberofbytesrecvd: *mut c_uint,
dwflags: c_uint,
lpoverlapped: *mut OVERLAPPED,
lpcompletionroutine: LPWSAOVERLAPPED_COMPLETION_ROUTINE,
) -> c_int
);
Loading
Loading