summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/core/hle/kernel/event.cpp2
-rw-r--r--src/core/hle/kernel/kernel.h14
-rw-r--r--src/core/hle/kernel/mutex.cpp4
-rw-r--r--src/core/hle/kernel/semaphore.cpp2
-rw-r--r--src/core/hle/kernel/session.h11
-rw-r--r--src/core/hle/kernel/thread.cpp4
-rw-r--r--src/core/hle/kernel/thread.h2
-rw-r--r--src/core/hle/kernel/timer.cpp2
-rw-r--r--src/core/hle/svc.cpp4
9 files changed, 22 insertions, 23 deletions
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp
index 37f01652e..bed856020 100644
--- a/src/core/hle/kernel/event.cpp
+++ b/src/core/hle/kernel/event.cpp
@@ -28,7 +28,7 @@ public:
bool signaled; ///< Whether the event has already been signaled
std::string name; ///< Name of event (optional)
- ResultVal<bool> Wait() override {
+ ResultVal<bool> ShouldWait() override {
return MakeResult<bool>(!signaled);
}
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h
index ca9ccf4bf..1bb0b55bd 100644
--- a/src/core/hle/kernel/kernel.h
+++ b/src/core/hle/kernel/kernel.h
@@ -117,22 +117,16 @@ class WaitObject : public Object {
public:
/**
- * Check if this object is available
+ * Check if the current thread should wait until the object is available
* @return True if the current thread should wait due to this object being unavailable
*/
- virtual ResultVal<bool> Wait() {
- LOG_ERROR(Kernel, "(UNIMPLEMENTED)");
- return UnimplementedFunction(ErrorModule::Kernel);
- }
+ virtual ResultVal<bool> ShouldWait() = 0;
/**
- * Acquire/lock the this object if it is available
+ * Acquire/lock the object if it is available
* @return True if we were able to acquire this object, otherwise false
*/
- virtual ResultVal<bool> Acquire() {
- LOG_ERROR(Kernel, "(UNIMPLEMENTED)");
- return UnimplementedFunction(ErrorModule::Kernel);
- }
+ virtual ResultVal<bool> Acquire() = 0;
/**
* Add a thread to wait on this object
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp
index 6cd140376..01d2263ff 100644
--- a/src/core/hle/kernel/mutex.cpp
+++ b/src/core/hle/kernel/mutex.cpp
@@ -27,7 +27,7 @@ public:
std::string name; ///< Name of mutex (optional)
SharedPtr<Thread> current_thread; ///< Thread that has acquired the mutex
- ResultVal<bool> Wait() override;
+ ResultVal<bool> ShouldWait() override;
ResultVal<bool> Acquire() override;
};
@@ -159,7 +159,7 @@ Handle CreateMutex(bool initial_locked, const std::string& name) {
return handle;
}
-ResultVal<bool> Mutex::Wait() {
+ResultVal<bool> Mutex::ShouldWait() {
return MakeResult<bool>(locked && (current_thread != GetCurrentThread()));
}
diff --git a/src/core/hle/kernel/semaphore.cpp b/src/core/hle/kernel/semaphore.cpp
index 6ccdb2a8f..24d41c0b3 100644
--- a/src/core/hle/kernel/semaphore.cpp
+++ b/src/core/hle/kernel/semaphore.cpp
@@ -32,7 +32,7 @@ public:
return available_count > 0;
}
- ResultVal<bool> Wait() override {
+ ResultVal<bool> ShouldWait() override {
return MakeResult<bool>(!IsAvailable());
}
diff --git a/src/core/hle/kernel/session.h b/src/core/hle/kernel/session.h
index e11f727a5..f0343d9b2 100644
--- a/src/core/hle/kernel/session.h
+++ b/src/core/hle/kernel/session.h
@@ -54,11 +54,16 @@ public:
*/
virtual ResultVal<bool> SyncRequest() = 0;
- ResultVal<bool> Wait() override {
- // TODO(bunnei): This function exists to satisfy a hardware test with a Session object
- // passed into WaitSynchronization. Not sure if it's possible for this to ever be false?
+ // TODO(bunnei): These functions exist to satisfy a hardware test with a Session object
+ // passed into WaitSynchronization. Figure out the meaning of them.
+
+ ResultVal<bool> ShouldWait() override {
return MakeResult<bool>(true);
}
+
+ ResultVal<bool> Acquire() override {
+ return MakeResult<bool>(false);
+ }
};
}
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 271828ea7..8a2cf8bf4 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -22,7 +22,7 @@
namespace Kernel {
-ResultVal<bool> Thread::Wait() {
+ResultVal<bool> Thread::ShouldWait() {
return MakeResult<bool>(status != THREADSTATUS_DORMANT);
}
@@ -269,7 +269,7 @@ void Thread::ReleaseWaitObject(WaitObject* wait_object) {
// Iterate through all waiting objects to check availability...
for (auto itr = wait_objects.begin(); itr != wait_objects.end(); ++itr) {
- auto res = (*itr)->Wait();
+ auto res = (*itr)->ShouldWait();
if (*res && res.Succeeded())
wait_all_failed = true;
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h
index a3a17e6c0..b23638bd1 100644
--- a/src/core/hle/kernel/thread.h
+++ b/src/core/hle/kernel/thread.h
@@ -58,7 +58,7 @@ public:
inline bool IsSuspended() const { return (status & THREADSTATUS_SUSPEND) != 0; }
inline bool IsIdle() const { return idle; }
- ResultVal<bool> Wait() override;
+ ResultVal<bool> ShouldWait() override;
ResultVal<bool> Acquire() override;
s32 GetPriority() const { return current_priority; }
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp
index 62bdf07c7..1729cca0f 100644
--- a/src/core/hle/kernel/timer.cpp
+++ b/src/core/hle/kernel/timer.cpp
@@ -29,7 +29,7 @@ public:
u64 initial_delay; ///< The delay until the timer fires for the first time
u64 interval_delay; ///< The delay until the timer fires after the first time
- ResultVal<bool> Wait() override {
+ ResultVal<bool> ShouldWait() override {
return MakeResult<bool>(!signaled);
}
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp
index d72839172..fd2d22727 100644
--- a/src/core/hle/svc.cpp
+++ b/src/core/hle/svc.cpp
@@ -122,7 +122,7 @@ static Result WaitSynchronization1(Handle handle, s64 nano_seconds) {
LOG_TRACE(Kernel_SVC, "called handle=0x%08X(%s:%s), nanoseconds=%lld", handle,
object->GetTypeName().c_str(), object->GetName().c_str(), nano_seconds);
- ResultVal<bool> wait = object->Wait();
+ ResultVal<bool> wait = object->ShouldWait();
// Check for next thread to schedule
if (wait.Succeeded() && *wait) {
@@ -167,7 +167,7 @@ static Result WaitSynchronizationN(s32* out, Handle* handles, s32 handle_count,
if (object == nullptr)
return InvalidHandle(ErrorModule::Kernel).raw;
- ResultVal<bool> wait = object->Wait();
+ ResultVal<bool> wait = object->ShouldWait();
// Check if the current thread should wait on this object...
if (wait.Succeeded() && *wait) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 16:58:59 +0100