OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-12-19 02:11:06 +00:00
Code Issues Projects Releases Wiki Activity

Adressed review comments

Browse Source
This commit is contained in:
B3n30 2018-10-08 23:28:54 +02:00
parent 7efe60ed23
commit ad8b9c0429
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/logging/backend.cpp
View File

@ -81,7 +81,8 @@ private:
backend->Write(e); backend->Write(e);
} }
}; };
while (message_queue.PopWait(entry)) { while (true) {
entry = message_queue.PopWait();
if (entry.final_entry) { if (entry.final_entry) {
break; break;
} }

15
src/common/threadsafe_queue.h
View File

@ -42,7 +42,7 @@ public:
template <typename Arg> template <typename Arg>
void Push(Arg&& t) { void Push(Arg&& t) {
// create the element, add it to the queue // create the element, add it to the queue
write_ptr->current = std::move(t); write_ptr->current = std::forward<Arg>(t);
// set the next pointer to a new element ptr // set the next pointer to a new element ptr
// then advance the write pointer // then advance the write pointer
ElementPtr* new_ptr = new ElementPtr(); ElementPtr* new_ptr = new ElementPtr();
@ -68,11 +68,10 @@ public:
if (Empty()) if (Empty())
return false; return false;
ElementPtr* tmpptr = read_ptr;
if (NeedSize) if (NeedSize)
size--; size--;
ElementPtr* tmpptr = read_ptr;
read_ptr = tmpptr->next.load(std::memory_order_acquire); read_ptr = tmpptr->next.load(std::memory_order_acquire);
t = std::move(tmpptr->current); t = std::move(tmpptr->current);
tmpptr->next.store(nullptr); tmpptr->next.store(nullptr);
@ -80,12 +79,14 @@ public:
return true; return true;
} }
bool PopWait(T& t) { T PopWait() {
if (Empty()) { if (Empty()) {
std::unique_lock<std::mutex> lock(cv_mutex); std::unique_lock<std::mutex> lock(cv_mutex);
cv.wait(lock, [this]() { return !Empty(); }); cv.wait(lock, [this]() { return !Empty(); });
} }
return Pop(t); T t;
Pop(t);
return t;
} }
// not thread-safe // not thread-safe
@ -151,8 +152,8 @@ public:
return spsc_queue.Pop(t); return spsc_queue.Pop(t);
} }
bool PopWait(T& t) { T PopWait() {
return spsc_queue.PopWait(t); return spsc_queue.PopWait();
} }
// not thread-safe // not thread-safe

5
src/core/rpc/rpc_server.cpp
View File

@ -106,10 +106,7 @@ void RPCServer::HandleRequestsLoop() {
LOG_INFO(RPC_Server, "Request handler started."); LOG_INFO(RPC_Server, "Request handler started.");
while (request_queue.PopWait(request_packet)) { while ((request_packet = request_queue.PopWait())) {
if (!request_packet) {
break;
}
HandleSingleRequest(std::move(request_packet)); HandleSingleRequest(std::move(request_packet));
} }
} }