diff --git a/ylong_runtime/src/executor/current_thread.rs b/ylong_runtime/src/executor/current_thread.rs index 2f9127db1a10389fe757c3d173869af1873c4994..669f9b7cdf82f63bed264bb254b6f00a810d64a1 100644 --- a/ylong_runtime/src/executor/current_thread.rs +++ b/ylong_runtime/src/executor/current_thread.rs @@ -194,19 +194,13 @@ mod test { )* } } - macro_rules! cfg_net { - ($($item:item)*) => { - $( - #[cfg(feature = "net")] - $item - )* - } - } + use std::future::Future; use std::pin::Pin; use std::task::{Context, Poll}; use crate::executor::current_thread::CurrentThreadSpawner; + use crate::macros::cfg_io; use crate::task::{yield_now, TaskBuilder}; cfg_sync! { @@ -247,7 +241,7 @@ mod test { } } - cfg_net! { + cfg_io! { use std::net::SocketAddr; use crate::net::{TcpListener, TcpStream}; use crate::io::{AsyncReadExt, AsyncWriteExt}; diff --git a/ylong_runtime/src/lib.rs b/ylong_runtime/src/lib.rs index de17f595dcd40bc79a136062796e7a1737bf2c1f..fbbe9254a25c3a16bd473c1c321e1fdffbc73a24 100644 --- a/ylong_runtime/src/lib.rs +++ b/ylong_runtime/src/lib.rs @@ -59,7 +59,6 @@ pub mod util; cfg_io! { pub mod net; - pub(crate) mod schedule_io; } /// Using the default task setting, spawns a task onto the global runtime. diff --git a/ylong_runtime/src/net/mod.rs b/ylong_runtime/src/net/mod.rs index bc877682f407f2a8b1bfb2cc36b7b2becd3e27e3..85b3086783191813d56a603934c127385eeeeada 100644 --- a/ylong_runtime/src/net/mod.rs +++ b/ylong_runtime/src/net/mod.rs @@ -16,9 +16,9 @@ pub(crate) use driver::Handle; pub(crate) use linked_list::{LinkedList, Node}; pub(crate) use ready::{Ready, ReadyEvent}; +pub(crate) use schedule_io::{ScheduleIO, Tick}; pub use sys::{Listener, Stream}; -pub(crate) use crate::schedule_io::{ScheduleIO, Tick}; pub(crate) mod async_source; pub(crate) mod sys; pub(crate) use async_source::AsyncSource; @@ -28,6 +28,7 @@ use crate::macros::cfg_io; pub(crate) mod driver; mod linked_list; pub(crate) mod ready; +pub(crate) mod schedule_io; cfg_io! { pub use sys::{TcpListener, TcpStream}; diff --git a/ylong_runtime/src/schedule_io.rs b/ylong_runtime/src/net/schedule_io.rs similarity index 99% rename from ylong_runtime/src/schedule_io.rs rename to ylong_runtime/src/net/schedule_io.rs index ff1eeb66828428cbac30b156749d309049fda385..37e7ceb80b437f18ff175c11847903cefb9511e1 100644 --- a/ylong_runtime/src/schedule_io.rs +++ b/ylong_runtime/src/net/schedule_io.rs @@ -386,8 +386,7 @@ mod schedule_io_test { use std::io; use std::sync::atomic::Ordering::{Acquire, Release}; - use crate::net::{Ready, ReadyEvent}; - use crate::schedule_io::{ScheduleIO, Tick}; + use crate::net::{Ready, ReadyEvent, ScheduleIO, Tick}; use crate::util::slab::Entry; /// UT test cases for schedule_io defalut diff --git a/ylong_runtime/src/util/core_affinity/windows.rs b/ylong_runtime/src/util/core_affinity/windows.rs index 6a7c5dd8c05779fe6de405ccc95f5d2bf229bc5e..577a548910a0e3db4b6d2ee1a0cef8dbbbdaa790 100644 --- a/ylong_runtime/src/util/core_affinity/windows.rs +++ b/ylong_runtime/src/util/core_affinity/windows.rs @@ -50,4 +50,4 @@ pub fn set_current_affinity(cpu: usize) -> Result<()> { 0 => Err(Error::last_os_error()), _ => Ok(()), } -} \ No newline at end of file +}