diff --git a/ylong_io/src/sys/windows/udp/udp_socket.rs b/ylong_io/src/sys/windows/udp/udp_socket.rs index 1718d56cef9f2e7ec4c6cdf67c13654bab5275a9..c9be3f75ba9c280ab29fdd7127b71c06af126a6e 100644 --- a/ylong_io/src/sys/windows/udp/udp_socket.rs +++ b/ylong_io/src/sys/windows/udp/udp_socket.rs @@ -308,7 +308,7 @@ impl Source for UdpSocket { interests: Interest, ) -> io::Result<()> { self.state - .register(selector, token, interests, self.inner.as_raw_socket()) + .register(selector, token, interests, self.as_raw_fd()) } fn reregister( @@ -337,7 +337,7 @@ impl Source for ConnectedUdpSocket { interests: Interest, ) -> io::Result<()> { self.state - .register(selector, token, interests, self.inner.as_raw_socket()) + .register(selector, token, interests, self.as_raw_fd()) } fn reregister( diff --git a/ylong_runtime/src/builder/mod.rs b/ylong_runtime/src/builder/mod.rs index 4b0e3af3407bc4aaf26542e885756c90316fea78..d7477cf4c2229285831c50498a67c911efb9c6ff 100644 --- a/ylong_runtime/src/builder/mod.rs +++ b/ylong_runtime/src/builder/mod.rs @@ -44,7 +44,8 @@ use crate::error::ScheduleError; use crate::executor::blocking_pool::BlockPoolSpawner; #[cfg(any(feature = "net", feature = "time"))] use crate::executor::netpoller::NetLooper; -crate::macros::cfg_not_ffrt!( + +cfg_not_ffrt!( use crate::executor::async_pool::AsyncPoolSpawner; ); diff --git a/ylong_runtime/src/executor/current_thread.rs b/ylong_runtime/src/executor/current_thread.rs index 2f9127db1a10389fe757c3d173869af1873c4994..c0e469dc423df76c4f16b0b526b421779f250ee1 100644 --- a/ylong_runtime/src/executor/current_thread.rs +++ b/ylong_runtime/src/executor/current_thread.rs @@ -20,9 +20,9 @@ use std::sync::atomic::Ordering::{Acquire, Release}; use std::sync::{Arc, Mutex}; use std::task::{Context, Poll, RawWaker, RawWakerVTable, Waker}; -use crate::cfg_io; use crate::executor::Schedule; use crate::task::{JoinHandle, Task, TaskBuilder, VirtualTableType}; + cfg_io!( use std::time::Duration; use crate::net::Driver; diff --git a/ylong_runtime/src/executor/mod.rs b/ylong_runtime/src/executor/mod.rs index 685684b221a8688da3c5335fa38079bbe4e4f9ca..ca5b0c2684a7d59dac99033ea4f4dd5eee5e5858 100644 --- a/ylong_runtime/src/executor/mod.rs +++ b/ylong_runtime/src/executor/mod.rs @@ -30,7 +30,6 @@ use crate::builder::{initialize_blocking_spawner, RuntimeBuilder}; use crate::executor::blocking_pool::BlockPoolSpawner; #[cfg(feature = "current_thread_runtime")] use crate::executor::current_thread::CurrentThreadSpawner; -use crate::macros::{cfg_ffrt, cfg_not_ffrt}; use crate::task::TaskBuilder; use crate::{JoinHandle, Task}; cfg_ffrt! { diff --git a/ylong_runtime/src/iter/core.rs b/ylong_runtime/src/iter/core.rs index f5f9155d8128c78809649252cd2ac14d70dc10cc..9cb10d4d18446d1ed099883371037931818ddafb 100644 --- a/ylong_runtime/src/iter/core.rs +++ b/ylong_runtime/src/iter/core.rs @@ -14,7 +14,6 @@ use super::pariter::{Consumer, ParallelIterator}; use crate::error::ScheduleError; use crate::executor::{global_default_async, AsyncHandle}; -use crate::macros::{cfg_ffrt, cfg_not_ffrt}; use crate::task::{JoinHandle, TaskBuilder}; cfg_not_ffrt! { use crate::executor::{async_pool::AsyncPoolSpawner}; diff --git a/ylong_runtime/src/lib.rs b/ylong_runtime/src/lib.rs index de17f595dcd40bc79a136062796e7a1737bf2c1f..a464432764913f38f9d9c6a38af47032350c1fe6 100644 --- a/ylong_runtime/src/lib.rs +++ b/ylong_runtime/src/lib.rs @@ -26,9 +26,10 @@ compile_error!("Feature ffrt only works on linux currently"); extern crate core; use std::future::Future; +#[macro_use] +pub(crate) mod macros; use crate::error::ScheduleError; -use crate::macros::cfg_io; use crate::task::{JoinHandle, Task, TaskBuilder}; pub mod builder; @@ -42,7 +43,6 @@ pub mod fs; pub mod futures; pub mod io; pub mod iter; -pub(crate) mod macros; #[cfg(feature = "macros")] mod select; #[cfg(feature = "macros")] diff --git a/ylong_runtime/src/macros.rs b/ylong_runtime/src/macros.rs index 5bd89ba38357859b0de333cee4e7f7e4e19916ba..7ce442dbad4463587a6d2869c4ed2ef5ad049aed 100644 --- a/ylong_runtime/src/macros.rs +++ b/ylong_runtime/src/macros.rs @@ -20,8 +20,6 @@ macro_rules! cfg_io { } } -pub(crate) use cfg_io; - macro_rules! cfg_ffrt { ($($item:item)*) => { $( @@ -31,8 +29,6 @@ macro_rules! cfg_ffrt { } } -pub(crate) use cfg_ffrt; - macro_rules! cfg_not_ffrt { ($($item:item)*) => { $( @@ -41,5 +37,3 @@ macro_rules! cfg_not_ffrt { )* } } - -pub(crate) use cfg_not_ffrt; diff --git a/ylong_runtime/src/net/async_source.rs b/ylong_runtime/src/net/async_source.rs index c6fdad785c1f368daaf7dab755293b415fe2d538..be3ce8f817f08fa69939e55c9795745da65715b7 100644 --- a/ylong_runtime/src/net/async_source.rs +++ b/ylong_runtime/src/net/async_source.rs @@ -16,7 +16,6 @@ use std::ops::Deref; use ylong_io::{Interest, Source}; -use crate::macros::cfg_io; use crate::net::ScheduleIO; use crate::util::slab::Ref; diff --git a/ylong_runtime/src/net/driver.rs b/ylong_runtime/src/net/driver.rs index 8db0e6b7f7233d9b69b71ca69698024dc26e6738..4412279d76fe0076aa9c20ec58c4badba056b23f 100644 --- a/ylong_runtime/src/net/driver.rs +++ b/ylong_runtime/src/net/driver.rs @@ -17,7 +17,6 @@ use std::sync::{Arc, Mutex}; use ylong_io::{Interest, Source, Token}; -use crate::macros::{cfg_ffrt, cfg_not_ffrt}; use crate::net::{Ready, ScheduleIO, Tick}; use crate::util::bit::{Bit, Mask}; use crate::util::slab::{Address, Ref, Slab}; diff --git a/ylong_runtime/src/net/mod.rs b/ylong_runtime/src/net/mod.rs index bc877682f407f2a8b1bfb2cc36b7b2becd3e27e3..38e748f23515e740564555d5e0f49920022ae806 100644 --- a/ylong_runtime/src/net/mod.rs +++ b/ylong_runtime/src/net/mod.rs @@ -23,8 +23,6 @@ pub(crate) mod async_source; pub(crate) mod sys; pub(crate) use async_source::AsyncSource; -use crate::macros::cfg_io; - pub(crate) mod driver; mod linked_list; pub(crate) mod ready; diff --git a/ylong_runtime/src/net/ready.rs b/ylong_runtime/src/net/ready.rs index 7a61d7eb9a234e9b99849e66c305c19711708a41..0fb540cf634d0d31f8873157e5b9d6e699bfa09e 100644 --- a/ylong_runtime/src/net/ready.rs +++ b/ylong_runtime/src/net/ready.rs @@ -20,7 +20,7 @@ const WRITABLE: usize = 0b0_10; const READ_CLOSED: usize = 0b0_0100; const WRITE_CLOSED: usize = 0b0_1000; -crate::macros::cfg_not_ffrt! { +cfg_not_ffrt! { use ylong_io::{Event, EventTrait}; } @@ -169,7 +169,7 @@ impl ReadyEvent { } } -crate::macros::cfg_ffrt! { +cfg_ffrt! { fn is_readable(event: i32) -> bool { (event as libc::c_int & libc::EPOLLIN) != 0 || (event as libc::c_int & libc::EPOLLPRI) != 0 diff --git a/ylong_runtime/src/net/sys/mod.rs b/ylong_runtime/src/net/sys/mod.rs index 3c999674276b6ee5328de00bedfa725f065bfd86..0d6d83b68e59bf73bb3fb40ff5f9a03379f2382e 100644 --- a/ylong_runtime/src/net/sys/mod.rs +++ b/ylong_runtime/src/net/sys/mod.rs @@ -15,8 +15,6 @@ use std::io; use std::net::SocketAddr; use std::sync::Arc; -use crate::macros::cfg_io; - cfg_io! { mod tcp; pub use tcp::{TcpListener, TcpStream}; diff --git a/ylong_runtime/src/task/raw.rs b/ylong_runtime/src/task/raw.rs index f1a1f217165297ef28436ac787362f1e3e2653d2..9b30e6620cfa767883c308a51d23c708d9e78e66 100644 --- a/ylong_runtime/src/task/raw.rs +++ b/ylong_runtime/src/task/raw.rs @@ -20,7 +20,6 @@ use std::sync::Weak; use std::task::{Context, Poll, Waker}; use crate::executor::Schedule; -use crate::macros::cfg_ffrt; use crate::task::state::TaskState; use crate::task::task_handle::TaskHandle; use crate::task::{TaskBuilder, VirtualTableType}; diff --git a/ylong_runtime/src/task/state.rs b/ylong_runtime/src/task/state.rs index a01c9b864c5bbdb0a5e8bbe335f1885076809386..e33f1344c5614c9377d0ae98afdeee9bb7a13778 100644 --- a/ylong_runtime/src/task/state.rs +++ b/ylong_runtime/src/task/state.rs @@ -11,13 +11,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -/// Task state, include SCHEDULED RUNNING COMPLETED CLOSED and so on and -/// transform method use std::sync::atomic::AtomicUsize; use std::sync::atomic::Ordering::{AcqRel, Acquire, Relaxed}; use crate::error::ErrorKind; -use crate::macros::cfg_not_ffrt; /// Task is currently running const RUNNING: usize = 0b0001; diff --git a/ylong_runtime/src/task/task_handle.rs b/ylong_runtime/src/task/task_handle.rs index f00566bb5c87df96743f9e62dfacf56633a5dc72..419ff7d04b60c70c61c04763e57517068c513675 100644 --- a/ylong_runtime/src/task/task_handle.rs +++ b/ylong_runtime/src/task/task_handle.rs @@ -18,7 +18,6 @@ use std::task::{Context, Poll, Waker}; use crate::error::{ErrorKind, ScheduleError}; use crate::executor::Schedule; -use crate::macros::{cfg_ffrt, cfg_not_ffrt}; use crate::task::raw::{Header, Inner, TaskMngInfo}; use crate::task::state::StateAction; use crate::task::waker::WakerRefHeader; diff --git a/ylong_runtime/src/time/wheel.rs b/ylong_runtime/src/time/wheel.rs index 727480f55aa7e530912b2d82e1c3347f1575aeed..75e414c4b4c863c6942078b3841c7d47d06dd6ec 100644 --- a/ylong_runtime/src/time/wheel.rs +++ b/ylong_runtime/src/time/wheel.rs @@ -315,7 +315,6 @@ fn level_range(level: usize) -> u64 { #[cfg(test)] mod test { - use crate::macros::cfg_io; use crate::time::wheel::{Wheel, LEVELS_NUM}; cfg_io!( use crate::time::{sleep, timeout, Driver}; 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 +}