[feat] refactor axstd sync, expose sync types provided by axsync dire…

…ctly

api/axfeat/Cargo.toml

@@ -19,7 +19,7 @@ smp = ["axhal/smp", "axruntime/smp", "axtask?/smp", "kspin/smp"]
 fp_simd = ["axhal/fp_simd"]
 
 # Interrupts
-irq = ["axhal/irq", "axruntime/irq", "axtask?/irq"]
+irq = ["axhal/irq", "axruntime/irq", "axtask?/irq", "axsync/irq"]
 
 # Memory
 alloc = ["axalloc", "axruntime/alloc"]

modules/axsync/Cargo.toml

@@ -11,6 +11,7 @@ documentation = "https://arceos-org.github.io/arceos/axsync/index.html"
 
 [features]
 multitask = ["axtask/multitask", "dep:axhal"]
+irq = ["axtask/irq"]
 default = []
 
 [dependencies]

modules/axsync/src/condvar.rs

@@ -179,7 +179,9 @@ impl Condvar {
         };
 
         // Lock the mutex again.
-        (mutex.lock(), WaitTimeoutResult(!success))
+        mutex.inner_lock();
+
+        (guard, WaitTimeoutResult(!success))
     }
 
     /// Waits on this condition variable for a notification, timing out after a

modules/axsync/src/lib.rs

@@ -28,10 +28,10 @@ cfg_if::cfg_if! {
         mod semaphore;
 
         pub use self::barrier::{Barrier, BarrierWaitResult};
-        pub use self::condvar::Condvar;
+        pub use self::condvar::{Condvar, WaitTimeoutResult};
         #[doc(cfg(feature = "multitask"))]
         pub use self::mutex::{Mutex, MutexGuard};
-        pub use semaphore::Semaphore;
+        pub use semaphore::{Semaphore, SemaphoreGuard};
     } else {
         #[doc(cfg(not(feature = "multitask")))]
         pub use kspin::{SpinNoIrq as Mutex, SpinNoIrqGuard as MutexGuard};

ulib/axstd/Cargo.toml

@@ -75,6 +75,7 @@ log-level-trace = ["axfeat/log-level-trace"]
 [dependencies]
 axfeat = { workspace = true }
 arceos_api = { workspace = true }
+axsync = { workspace = true }
 axio = "0.1"
 axerrno = "0.1"
 kspin = "0.1"

ulib/axstd/src/sync.rs

@@ -0,0 +1,26 @@
+//! Useful synchronization primitives.
+
+#[doc(no_inline)]
+pub use core::sync::atomic;
+
+#[cfg(feature = "alloc")]
+#[doc(no_inline)]
+pub use alloc::sync::{Arc, Weak};
+
+// Re-export the `Mutex` and `MutexGuard` types.
+pub use axsync::{Mutex, MutexGuard};
+
+// Re-export the `RwLock` and related types.
+pub use axsync::{
+    MappedRwLockReadGuard, MappedRwLockWriteGuard, RwLock, RwLockReadGuard, RwLockWriteGuard,
+};
+
+// Re-export the `Barrier` and `BarrierWaitResult` types.
+#[cfg(feature = "multitask")]
+pub use axsync::{Barrier, BarrierWaitResult};
+// Re-export the `Condvar` and `WaitTimeoutResult` types.
+#[cfg(feature = "multitask")]
+pub use axsync::{Condvar, WaitTimeoutResult};
+// Re-export the `Semaphore` and `SemaphoreGuard` types.
+#[cfg(feature = "multitask")]
+pub use axsync::{Semaphore, SemaphoreGuard};