Merge pull request #72168 from RandomShaper/sensible_lock_return

Booleanize various sync primitives' wait & locking methods

2 files changed, 8 insertions, 11 deletions

diff --git a/core/os/mutex.h b/core/os/mutex.h
index c91917a9a1..ceedcb235a 100644
--- a/core/os/mutex.h
+++ b/core/os/mutex.h
@@ -31,7 +31,6 @@
 #ifndef MUTEX_H
 #define MUTEX_H
 
-#include "core/error/error_list.h"
 #include "core/typedefs.h"
 
 #include <mutex>
@@ -49,8 +48,8 @@ public:
 		mutex.unlock();
 	}
 
-	_ALWAYS_INLINE_ Error try_lock() const {
-		return mutex.try_lock() ? OK : ERR_BUSY;
+	_ALWAYS_INLINE_ bool try_lock() const {
+		return mutex.try_lock();
 	}
 };
 
diff --git a/core/os/rw_lock.h b/core/os/rw_lock.h
index e290b7c00b..7b232600b7 100644
--- a/core/os/rw_lock.h
+++ b/core/os/rw_lock.h
@@ -31,8 +31,6 @@
 #ifndef RW_LOCK_H
 #define RW_LOCK_H
 
-#include "core/error/error_list.h"
-
 #include <shared_mutex>
 
 class RWLock {
@@ -49,9 +47,9 @@ public:
 		mutex.unlock_shared();
 	}
 
-	// Attempt to lock the rwlock, OK on success, ERR_BUSY means it can't lock.
-	Error read_try_lock() const {
-		return mutex.try_lock_shared() ? OK : ERR_BUSY;
+	// Attempt to lock the RWLock for reading. True on success, false means it can't lock.
+	bool read_try_lock() const {
+		return mutex.try_lock_shared();
 	}
 
 	// Lock the rwlock, block if locked by someone else
@@ -64,9 +62,9 @@ public:
 		mutex.unlock();
 	}
 
-	// Attempt to lock the rwlock, OK on success, ERR_BUSY means it can't lock.
-	Error write_try_lock() {
-		return mutex.try_lock() ? OK : ERR_BUSY;
+	// Attempt to lock the RWLock for writing. True on success, false means it can't lock.
+	bool write_try_lock() {
+		return mutex.try_lock();
 	}
 };