From f6b38f7425a3183214dae79445446b042154688f Mon Sep 17 00:00:00 2001 From: Botahamec Date: Wed, 5 Feb 2025 20:31:00 -0500 Subject: Tests and optimization --- tests/evil_mutex.rs | 26 +++++++++++++++++++++++++- tests/evil_rwlock.rs | 26 +++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/evil_mutex.rs b/tests/evil_mutex.rs index 88bcbf6..361fe4c 100644 --- a/tests/evil_mutex.rs +++ b/tests/evil_mutex.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use happylock::collection::BoxedLockCollection; +use happylock::collection::{BoxedLockCollection, RetryingLockCollection}; use happylock::mutex::Mutex; use happylock::ThreadKey; use lock_api::{GuardNoSend, RawMutex}; @@ -52,3 +52,27 @@ fn boxed_mutexes() { assert!(evil_mutex.try_lock(&mut key).is_err()); assert!(useless_mutex.try_lock(&mut key).is_ok()); } + +#[test] +fn retrying_mutexes() { + let mut key = ThreadKey::get().unwrap(); + let good_mutex: Arc> = Arc::new(Mutex::new(5)); + let evil_mutex: Arc> = Arc::new(Mutex::new(7)); + let useless_mutex: Arc> = Arc::new(Mutex::new(10)); + let c_good = Arc::clone(&good_mutex); + let c_evil = Arc::clone(&evil_mutex); + let c_useless = Arc::clone(&useless_mutex); + + let r = std::thread::spawn(move || { + let mut key = ThreadKey::get().unwrap(); + let collection = + RetryingLockCollection::try_new((&*c_good, &*c_evil, &*c_useless)).unwrap(); + collection.lock(&mut key); + }) + .join(); + + assert!(r.is_err()); + assert!(good_mutex.try_lock(&mut key).is_ok()); + assert!(evil_mutex.try_lock(&mut key).is_err()); + assert!(useless_mutex.try_lock(&mut key).is_ok()); +} diff --git a/tests/evil_rwlock.rs b/tests/evil_rwlock.rs index a1cf0b3..234847c 100644 --- a/tests/evil_rwlock.rs +++ b/tests/evil_rwlock.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use happylock::collection::BoxedLockCollection; +use happylock::collection::{BoxedLockCollection, RetryingLockCollection}; use happylock::rwlock::RwLock; use happylock::ThreadKey; use lock_api::{GuardNoSend, RawRwLock}; @@ -64,3 +64,27 @@ fn boxed_rwlocks() { assert!(evil_mutex.try_write(&mut key).is_err()); assert!(useless_mutex.try_write(&mut key).is_ok()); } + +#[test] +fn retrying_rwlocks() { + let mut key = ThreadKey::get().unwrap(); + let good_mutex: Arc> = Arc::new(RwLock::new(5)); + let evil_mutex: Arc> = Arc::new(RwLock::new(7)); + let useless_mutex: Arc> = Arc::new(RwLock::new(10)); + let c_good = Arc::clone(&good_mutex); + let c_evil = Arc::clone(&evil_mutex); + let c_useless = Arc::clone(&useless_mutex); + + let r = std::thread::spawn(move || { + let mut key = ThreadKey::get().unwrap(); + let collection = + RetryingLockCollection::try_new((&*c_good, &*c_evil, &*c_useless)).unwrap(); + collection.lock(&mut key); + }) + .join(); + + assert!(r.is_err()); + assert!(good_mutex.try_write(&mut key).is_ok()); + assert!(evil_mutex.try_write(&mut key).is_err()); + assert!(useless_mutex.try_write(&mut key).is_ok()); +} -- cgit v1.2.3