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

Use SPSCQueue::PopWait in Scripting

Browse source
This commit is contained in:
B3n30 2018-10-05 11:25:23 +02:00
parent 9b49a79a72
commit 7efe60ed23
4 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/core/rpc/rpc_server.cpp
View file

@ -106,10 +106,8 @@ void RPCServer::HandleRequestsLoop() {
LOG_INFO(RPC_Server, "Request handler started.");
while (true) {
std::unique_lock<std::mutex> lock(request_queue_mutex);
request_queue_cv.wait(lock, [&] { return !running || request_queue.Pop(request_packet); });
if (!running) {
while (request_queue.PopWait(request_packet)) {
if (!request_packet) {
break;
}
HandleSingleRequest(std::move(request_packet));
@ -117,23 +115,18 @@ void RPCServer::HandleRequestsLoop() {
}
void RPCServer::QueueRequest(std::unique_ptr<RPC::Packet> request) {
std::unique_lock<std::mutex> lock(request_queue_mutex);
request_queue.Push(std::move(request));
request_queue_cv.notify_one();
}
void RPCServer::Start() {
running = true;
const auto threadFunction = [this]() { HandleRequestsLoop(); };
request_handler_thread = std::thread(threadFunction);
server.Start();
}
void RPCServer::Stop() {
running = false;
request_queue_cv.notify_one();
request_handler_thread.join();
server.Stop();
request_handler_thread.join();
}
}; // namespace RPC