Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Thread: Keep track of multiple wait objects.

Browse source
This commit is contained in:
bunnei 2015-01-14 23:41:33 -05:00
parent 14cbbf4d9b
commit 1f7a04f05a
3 changed files with 30 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/core/hle/kernel/thread.h
View file

@ -96,7 +96,7 @@ public:
s32 processor_id;
WaitType wait_type;
Object* wait_object;
std::vector<SharedPtr<WaitObject>> wait_objects;
VAddr wait_address;
std::string name;
@ -128,7 +128,7 @@ Thread* GetCurrentThread();
* @param wait_type Type of wait
* @param wait_object Kernel object that we are waiting on, defaults to current thread
*/
void WaitCurrentThread(WaitType wait_type, Object* wait_object = GetCurrentThread());
void WaitCurrentThread(WaitType wait_type, WaitObject* wait_object = GetCurrentThread());
/**
* Schedules an event to wake up the specified thread after the specified delay.
@ -143,7 +143,7 @@ void WakeThreadAfterDelay(Thread* thread, s64 nanoseconds);
* @param wait_object Kernel object that we are waiting on
* @param wait_address Arbitration address used to resume from wait
*/
void WaitCurrentThread(WaitType wait_type, Object* wait_object, VAddr wait_address);
void WaitCurrentThread(WaitType wait_type, WaitObject* wait_object, VAddr wait_address);