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

Revert "Kernel/Threads: Add a new thread status that will allow using a Kernel::Event to put a guest thread to sleep inside an HLE handler until said event is signaled"

Browse source
This commit is contained in:
wwylele 2018-02-22 17:31:58 +02:00
parent e2eab46535
commit d9500ecf9b
2 changed files with 3 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/core/hle/service/service.cpp
View file

@ -9,7 +9,6 @@
#include "common/string_util.h"
#include "core/hle/ipc.h"
#include "core/hle/kernel/client_port.h"
#include "core/hle/kernel/event.h"
#include "core/hle/kernel/process.h"
#include "core/hle/kernel/server_port.h"
#include "core/hle/kernel/server_session.h"
@ -220,47 +219,6 @@ void AddService(Interface* interface_) {
server_port->SetHleHandler(std::shared_ptr<Interface>(interface_));
}
bool ThreadContinuationToken::IsValid() {
return thread != nullptr && event != nullptr;
}
ThreadContinuationToken SleepClientThread(const std::string& reason,
ThreadContinuationToken::Callback callback) {
auto thread = Kernel::GetCurrentThread();
ASSERT(thread->status == THREADSTATUS_RUNNING);
ThreadContinuationToken token;
token.event = Kernel::Event::Create(Kernel::ResetType::OneShot, "HLE Pause Event: " + reason);
token.thread = thread;
token.callback = std::move(callback);
token.pause_reason = std::move(reason);
// Make the thread wait on our newly created event, it will be signaled when
// ContinueClientThread is called.
thread->status = THREADSTATUS_WAIT_HLE_EVENT;
thread->wait_objects = {token.event};
token.event->AddWaitingThread(thread);
return token;
}
void ContinueClientThread(ThreadContinuationToken& token) {
ASSERT_MSG(token.IsValid(), "Invalid continuation token");
ASSERT(token.thread->status == THREADSTATUS_WAIT_HLE_EVENT);
// Signal the event to wake up the thread
token.event->Signal();
ASSERT(token.thread->status == THREADSTATUS_READY);
token.callback(token.thread);
token.event = nullptr;
token.thread = nullptr;
token.callback = nullptr;
}
/// Initialize ServiceManager
void Init() {
SM::g_service_manager = std::make_shared<SM::ServiceManager>();
@ -327,4 +285,4 @@ void Shutdown() {
g_kernel_named_ports.clear();
LOG_DEBUG(Service, "shutdown OK");
}
} // namespace Service
}