hook pthread_mutex_lock/pthread_mutex_unlock/WaitOnAddress and add tests

Agent-Logs-Url: https://github.com/acl-dev/open-coroutine/sessions/a4199b83-4d02-43f6-aa5a-f79a5303135a

Co-authored-by: loongs-zhang <38336731+loongs-zhang@users.noreply.github.com>

Author: Copilot

core/Cargo.toml

@@ -74,6 +74,9 @@ anyhow.workspace = true
 slab.workspace = true
 backtrace.workspace = true
 
+[target.'cfg(unix)'.dev-dependencies]
+libc.workspace = true
+
 [features]
 default = ["log", "syscall"]
 

core/tests/scheduler.rs

@@ -130,6 +130,40 @@ fn scheduler_listener() -> std::io::Result<()> {
     Ok(())
 }
 
+#[cfg(unix)]
+#[test]
+fn scheduler_pthread_mutex_lock() -> std::io::Result<()> {
+    use std::sync::atomic::{AtomicUsize, Ordering};
+
+    static COUNTER: AtomicUsize = AtomicUsize::new(0);
+
+    let mut scheduler = Scheduler::default();
+    for _ in 0..3 {
+        _ = scheduler.submit_co(
+            |_, _| {
+                let mut mutex = libc::PTHREAD_MUTEX_INITIALIZER;
+                let r = open_coroutine_core::syscall::pthread_mutex_lock(
+                    None,
+                    std::ptr::addr_of_mut!(mutex),
+                );
+                assert_eq!(0, r, "pthread_mutex_lock failed with {r}");
+                COUNTER.fetch_add(1, Ordering::SeqCst);
+                let r = open_coroutine_core::syscall::pthread_mutex_unlock(
+                    None,
+                    std::ptr::addr_of_mut!(mutex),
+                );
+                assert_eq!(0, r, "pthread_mutex_unlock failed with {r}");
+                None
+            },
+            None,
+            None,
+        )?;
+    }
+    scheduler.try_schedule()?;
+    assert_eq!(3, COUNTER.load(Ordering::SeqCst));
+    Ok(())
+}
+
 #[test]
 fn scheduler_try_cancel_coroutine() -> std::io::Result<()> {
     let mut scheduler = Scheduler::default();

hook/src/syscall/unix.rs

@@ -80,9 +80,8 @@ impl_hook!(RENAMEAT, renameat(olddirfd: c_int, oldpath: *const c_char, newdirfd:
 #[cfg(target_os = "linux")]
 impl_hook!(RENAMEAT2, renameat2(olddirfd: c_int, oldpath: *const c_char, newdirfd: c_int, newpath: *const c_char, flags: c_uint) -> c_int);
 
+impl_hook!(PTHREAD_MUTEX_LOCK, pthread_mutex_lock(lock: *mut pthread_mutex_t) -> c_int);
+impl_hook!(PTHREAD_MUTEX_UNLOCK, pthread_mutex_unlock(lock: *mut pthread_mutex_t) -> c_int);
+
 // NOTE: unhook poll due to mio's poller
 // impl_hook!(POLL, poll(fds: *mut pollfd, nfds: nfds_t, timeout: c_int) -> c_int);
-
-// NOTE: unhook pthread_mutex_lock/pthread_mutex_unlock due to stack overflow or bug
-// impl_hook!(PTHREAD_MUTEX_LOCK, pthread_mutex_lock(lock: *mut pthread_mutex_t) -> c_int);
-// impl_hook!(PTHREAD_MUTEX_UNLOCK, pthread_mutex_unlock(lock: *mut pthread_mutex_t) -> c_int);

hook/src/syscall/windows.rs

@@ -88,8 +88,7 @@ unsafe fn attach() -> std::io::Result<()> {
     impl_hook!("ws2_32.dll", WSASOCKETW, WSASocketW(domain: c_int, ty: WINSOCK_SOCKET_TYPE, protocol: IPPROTO, lpprotocolinfo: *const WSAPROTOCOL_INFOW, g: c_uint, dw_flags: c_uint) -> SOCKET);
     impl_hook!("ws2_32.dll", SELECT, select(nfds: c_int, readfds: *mut FD_SET, writefds: *mut FD_SET, errorfds: *mut FD_SET, timeout: *mut TIMEVAL) -> c_int);
     impl_hook!("ws2_32.dll", WSAPOLL, WSAPoll(fds: *mut WSAPOLLFD, nfds: c_uint, timeout: c_int) -> c_int);
-    // NOTE: unhook WaitOnAddress due to stack overflow or bug
-    // impl_hook!("api-ms-win-core-synch-l1-2-0.dll", WAITONADDRESS, WaitOnAddress(address: *const c_void, compareaddress: *const c_void, addresssize: usize, dwmilliseconds: c_uint) -> BOOL);
+    impl_hook!("api-ms-win-core-synch-l1-2-0.dll", WAITONADDRESS, WaitOnAddress(address: *const c_void, compareaddress: *const c_void, addresssize: usize, dwmilliseconds: c_uint) -> BOOL);
 
     // Enable the hook
     minhook::MinHook::enable_all_hooks().map_err(|_| Error::other("init all hooks failed !"))