prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrections for travis fail

Browse Source
This commit is contained in:
Vishal Sharma
2018-02-21 20:40:02 +05:30
parent b42faa8f85
commit 943a895ae2
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/hle/kernel/hle_ipc.cpp
View File

@@ -30,8 +30,9 @@ SharedPtr<Event> HLERequestContext::SleepClientThread(SharedPtr<Thread> thread,
const std::string& reason, u64 timeout, const std::string& reason, u64 timeout,
WakeupCallback&& callback) { WakeupCallback&& callback) {
// Put the client thread to sleep until the wait event is signaled or the timeout expires. // Put the client thread to sleep until the wait event is signaled or the timeout expires.
thread->wakeup_callback = [ context = *this, callback ]( thread->wakeup_callback = [ context = *this, callback ](ThreadWakeupReason reason,
ThreadWakeupReason reason, SharedPtr<Thread> thread, SharedPtr<WaitObject> object) mutable { SharedPtr<Thread> thread,
SharedPtr<WaitObject> object) mutable {
ASSERT(thread->status == THREADSTATUS_WAIT_HLE_EVENT); ASSERT(thread->status == THREADSTATUS_WAIT_HLE_EVENT);
callback(thread, context, reason); callback(thread, context, reason);

2
src/core/hle/kernel/hle_ipc.h
View File

@@ -6,8 +6,8 @@
#include <array> #include <array>
#include <memory> #include <memory>
#include <vector>
#include <string> #include <string>
#include <vector>
#include <boost/container/small_vector.hpp> #include <boost/container/small_vector.hpp>
#include "common/common_types.h" #include "common/common_types.h"
#include "common/swap.h" #include "common/swap.h"

4
src/core/hle/kernel/thread.cpp
View File

@@ -247,8 +247,8 @@ static void ThreadWakeupCallback(u64 thread_handle, int cycles_late) {
bool resume = true; bool resume = true;
if (thread->status == THREADSTATUS_WAIT_SYNCH_ANY || if (thread->status == THREADSTATUS_WAIT_SYNCH_ANY ||
thread->status == THREADSTATUS_WAIT_SYNCH_ALL || thread->status == THREADSTATUS_WAIT_ARB thread->status == THREADSTATUS_WAIT_SYNCH_ALL || thread->status == THREADSTATUS_WAIT_ARB ||
|| thread->status == THREADSTATUS_WAIT_HLE_EVENT) { thread->status == THREADSTATUS_WAIT_HLE_EVENT) {
// Remove the thread from each of its waiting objects' waitlists // Remove the thread from each of its waiting objects' waitlists
for (auto& object : thread->wait_objects) for (auto& object : thread->wait_objects)