mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4020 from RalfJung/thread-sope

Browse Source 
pthread-sync test: use thread::scope for more reliable thread scoping
This commit is contained in:
Ralf Jung 2024-11-09 10:16:25 +00:00 committed by GitHub
commit 5ff90d069a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/tools/miri/tests/pass-dep/libc/pthread-sync.rs
View File

@ -22,6 +22,22 @@ fn main() {
check_condattr(); check_condattr();
} }
// We want to only use pthread APIs here for easier testing.
// So we can't use `thread::scope`. That means panics can lead
// to a failure to join threads which can lead to further issues,
// so let's turn such unwinding into aborts.
struct AbortOnDrop;
impl AbortOnDrop {
fn defuse(self) {
mem::forget(self);
}
}
impl Drop for AbortOnDrop {
fn drop(&mut self) {
std::process::abort();
}
}
fn test_mutex_libc_init_recursive() { fn test_mutex_libc_init_recursive() {
unsafe { unsafe {
let mut attr: libc::pthread_mutexattr_t = mem::zeroed(); let mut attr: libc::pthread_mutexattr_t = mem::zeroed();
@ -122,6 +138,7 @@ impl<T> Clone for SendPtr<T> {
} }
fn check_mutex() { fn check_mutex() {
let bomb = AbortOnDrop;
// Specifically *not* using `Arc` to make sure there is no synchronization apart from the mutex. // Specifically *not* using `Arc` to make sure there is no synchronization apart from the mutex.
unsafe { unsafe {
let data = SyncUnsafeCell::new((libc::PTHREAD_MUTEX_INITIALIZER, 0)); let data = SyncUnsafeCell::new((libc::PTHREAD_MUTEX_INITIALIZER, 0));
@ -148,9 +165,11 @@ fn check_mutex() {
assert_eq!(libc::pthread_mutex_trylock(mutexptr), 0); assert_eq!(libc::pthread_mutex_trylock(mutexptr), 0);
assert_eq!((*ptr.ptr).1, 3); assert_eq!((*ptr.ptr).1, 3);
} }
bomb.defuse();
} }
fn check_rwlock_write() { fn check_rwlock_write() {
let bomb = AbortOnDrop;
unsafe { unsafe {
let data = SyncUnsafeCell::new((libc::PTHREAD_RWLOCK_INITIALIZER, 0)); let data = SyncUnsafeCell::new((libc::PTHREAD_RWLOCK_INITIALIZER, 0));
let ptr = SendPtr { ptr: data.get() }; let ptr = SendPtr { ptr: data.get() };
@ -187,9 +206,11 @@ fn check_rwlock_write() {
assert_eq!(libc::pthread_rwlock_tryrdlock(rwlockptr), 0); assert_eq!(libc::pthread_rwlock_tryrdlock(rwlockptr), 0);
assert_eq!((*ptr.ptr).1, 3); assert_eq!((*ptr.ptr).1, 3);
} }
bomb.defuse();
} }
fn check_rwlock_read_no_deadlock() { fn check_rwlock_read_no_deadlock() {
let bomb = AbortOnDrop;
unsafe { unsafe {
let l1 = SyncUnsafeCell::new(libc::PTHREAD_RWLOCK_INITIALIZER); let l1 = SyncUnsafeCell::new(libc::PTHREAD_RWLOCK_INITIALIZER);
let l1 = SendPtr { ptr: l1.get() }; let l1 = SendPtr { ptr: l1.get() };
@ -213,9 +234,11 @@ fn check_rwlock_read_no_deadlock() {
assert_eq!(libc::pthread_rwlock_rdlock(l2.ptr), 0); assert_eq!(libc::pthread_rwlock_rdlock(l2.ptr), 0);
handle.join().unwrap(); handle.join().unwrap();
} }
bomb.defuse();
} }
fn check_cond() { fn check_cond() {
let bomb = AbortOnDrop;
unsafe { unsafe {
let mut cond: MaybeUninit<libc::pthread_cond_t> = MaybeUninit::uninit(); let mut cond: MaybeUninit<libc::pthread_cond_t> = MaybeUninit::uninit();
assert_eq!(libc::pthread_cond_init(cond.as_mut_ptr(), ptr::null()), 0); assert_eq!(libc::pthread_cond_init(cond.as_mut_ptr(), ptr::null()), 0);
@ -260,6 +283,7 @@ fn check_cond() {
t.join().unwrap(); t.join().unwrap();
} }
bomb.defuse();
} }
fn check_condattr() { fn check_condattr() {