summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/thread.h
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2020-04-01 23:28:49 +0200
committerFernando Sahmkow <fsahmkow27@gmail.com>2020-06-27 17:36:05 +0200
commit48fa3b7a0f2054a836b0a8061e6b082c246b5ae0 (patch)
tree37a09cfb55f13ebf2df2b9a71622c599733100b0 /src/core/hle/kernel/thread.h
parentKernel/svcBreak: Implement CacheInvalidation for Singlecore and correct svcBreak. (diff)
downloadyuzu-48fa3b7a0f2054a836b0a8061e6b082c246b5ae0.tar
yuzu-48fa3b7a0f2054a836b0a8061e6b082c246b5ae0.tar.gz
yuzu-48fa3b7a0f2054a836b0a8061e6b082c246b5ae0.tar.bz2
yuzu-48fa3b7a0f2054a836b0a8061e6b082c246b5ae0.tar.lz
yuzu-48fa3b7a0f2054a836b0a8061e6b082c246b5ae0.tar.xz
yuzu-48fa3b7a0f2054a836b0a8061e6b082c246b5ae0.tar.zst
yuzu-48fa3b7a0f2054a836b0a8061e6b082c246b5ae0.zip
Diffstat (limited to 'src/core/hle/kernel/thread.h')
-rw-r--r--src/core/hle/kernel/thread.h56
1 files changed, 1 insertions, 55 deletions
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h
index 61963148d..3ae0df6ef 100644
--- a/src/core/hle/kernel/thread.h
+++ b/src/core/hle/kernel/thread.h
@@ -128,9 +128,6 @@ public:
using ThreadSynchronizationObjects = std::vector<std::shared_ptr<SynchronizationObject>>;
- using WakeupCallback =
- std::function<bool(ThreadWakeupReason reason, std::shared_ptr<Thread> thread,
- std::shared_ptr<SynchronizationObject> object, std::size_t index)>;
using HLECallback = std::function<bool(std::shared_ptr<Thread> thread)>;
/**
@@ -235,7 +232,7 @@ public:
}
/// Resumes a thread from waiting
- void /* deprecated */ ResumeFromWait();
+ void ResumeFromWait();
void OnWakeUp();
@@ -249,27 +246,6 @@ public:
///
void CancelWait();
- /**
- * Schedules an event to wake up the specified thread after the specified delay
- * @param nanoseconds The time this thread will be allowed to sleep for
- */
- void /* deprecated */ WakeAfterDelay(s64 nanoseconds);
-
- /// Cancel any outstanding wakeup events for this thread
- void /* deprecated */ CancelWakeupTimer();
-
- /**
- * Sets the result after the thread awakens (from svcWaitSynchronization)
- * @param result Value to set to the returned result
- */
- void /*deprecated*/ SetWaitSynchronizationResult(ResultCode result);
-
- /**
- * Sets the output parameter value after the thread awakens (from svcWaitSynchronization)
- * @param output Value to set to the output parameter
- */
- void /*deprecated*/ SetWaitSynchronizationOutput(s32 output);
-
void SetSynchronizationResults(SynchronizationObject* object, ResultCode result);
Core::ARM_Interface& ArmInterface();
@@ -330,11 +306,6 @@ public:
*/
VAddr GetCommandBufferAddress() const;
- /// Returns whether this thread is waiting on objects from a WaitSynchronization call.
- bool IsSleepingOnWait() const {
- return status == ThreadStatus::WaitSynch;
- }
-
ThreadContext32& GetContext32() {
return context_32;
}
@@ -469,18 +440,10 @@ public:
arb_wait_address = address;
}
- bool HasWakeupCallback() const {
- return wakeup_callback != nullptr;
- }
-
bool HasHLECallback() const {
return hle_callback != nullptr;
}
- void SetWakeupCallback(WakeupCallback callback) {
- wakeup_callback = std::move(callback);
- }
-
void SetHLECallback(HLECallback callback) {
hle_callback = std::move(callback);
}
@@ -501,22 +464,10 @@ public:
return hle_object;
}
- void InvalidateWakeupCallback() {
- SetWakeupCallback(nullptr);
- }
-
void InvalidateHLECallback() {
SetHLECallback(nullptr);
}
- /**
- * Invokes the thread's wakeup callback.
- *
- * @pre A valid wakeup callback has been set. Violating this precondition
- * will cause an assertion to trigger.
- */
- bool InvokeWakeupCallback(ThreadWakeupReason reason, std::shared_ptr<Thread> thread,
- std::shared_ptr<SynchronizationObject> object, std::size_t index);
bool InvokeHLECallback(std::shared_ptr<Thread> thread);
u32 GetIdealCore() const {
@@ -698,11 +649,6 @@ private:
/// Handle used as userdata to reference this object when inserting into the CoreTiming queue.
Handle global_handle = 0;
- /// Callback that will be invoked when the thread is resumed from a waiting state. If the thread
- /// was waiting via WaitSynchronization then the object will be the last object that became
- /// available. In case of a timeout, the object will be nullptr. DEPRECATED
- WakeupCallback wakeup_callback;
-
/// Callback for HLE Events
HLECallback hle_callback;
Handle hle_time_event;