Pointer checks

2 files changed, 25 insertions, 15 deletions

diff --git a/examples/double_mutex.rs b/examples/double_mutex.rs
index d1a939c..df11b7a 100644
--- a/examples/double_mutex.rs
+++ b/examples/double_mutex.rs
@@ -1,6 +1,6 @@
 use std::thread;
 
-use happylock::{LockGuard, Mutex, ThreadKey};
+use happylock::{LockCollection, Mutex, ThreadKey};
 
 const N: usize = 10;
 
@@ -13,7 +13,8 @@ fn main() {
 		let th = thread::spawn(move || {
 			let key = ThreadKey::lock().unwrap();
 			let data = (&DATA_1, &DATA_2);
-			let mut guard = LockGuard::lock(&data, key);
+			let lock = LockCollection::new(data).unwrap();
+			let mut guard = lock.lock(key);
 			*guard.1 = (100 - *guard.0).to_string();
 			*guard.0 += 1;
 		});
@@ -26,7 +27,8 @@ fn main() {
 
 	let key = ThreadKey::lock().unwrap();
 	let data = (&DATA_1, &DATA_2);
-	let data = LockGuard::lock(&data, key);
+	let data = LockCollection::new(data).unwrap();
+	let data = data.lock(key);
 	println!("{}", *data.0);
 	println!("{}", *data.1);
 }
diff --git a/examples/list.rs b/examples/list.rs
index 3903260..368a633 100644
--- a/examples/list.rs
+++ b/examples/list.rs
@@ -1,6 +1,6 @@
 use std::thread;
 
-use happylock::{LockGuard, Mutex, ThreadKey};
+use happylock::{LockCollection, Mutex, ThreadKey};
 
 const N: usize = 10;
 
@@ -30,16 +30,23 @@ fn main() {
 	for _ in 0..N {
 		let th = thread::spawn(move || {
 			let mut key = ThreadKey::lock().unwrap();
-			let mut data = Vec::new();
-			for _ in 0..3 {
-				let rand = random(&mut key);
-				data.push(&DATA[rand % 6]);
-			}
+			loop {
+				let mut data = Vec::new();
+				for _ in 0..3 {
+					let rand = random(&mut key);
+					data.push(&DATA[rand % 6]);
+				}
+
+				let Some(lock) = LockCollection::new(data) else {
+					continue;
+				};
+				let mut guard = lock.lock(&mut key);
+				*guard[0] += *guard[1];
+				*guard[1] += *guard[2];
+				*guard[2] += *guard[0];
 
-			let mut guard = LockGuard::lock(&data, key);
-			*guard[0] += *guard[1];
-			*guard[1] += *guard[2];
-			*guard[2] += *guard[0];
+				return;
+			}
 		});
 		threads.push(th);
 	}
@@ -48,8 +55,9 @@ fn main() {
 		_ = th.join();
 	}
 
-	let mut key = ThreadKey::lock().unwrap();
-	let data = LockGuard::lock(&DATA, &mut key);
+	let key = ThreadKey::lock().unwrap();
+	let data = LockCollection::new(&DATA).unwrap();
+	let data = data.lock(key);
 	for val in &*data {
 		println!("{}", **val);
 	}