2
1
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-07-04 23:31:19 +01:00

Adressed review comments

This commit is contained in:
B3n30 2018-10-08 23:28:54 +02:00 committed by fearlessTobi
parent 4154936568
commit 2195f10d15
2 changed files with 9 additions and 7 deletions

View file

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

View file

@ -40,7 +40,7 @@ public:
template <typename Arg>
void Push(Arg&& t) {
// 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
// then advance the write pointer
ElementPtr* new_ptr = new ElementPtr();
@ -69,7 +69,6 @@ public:
--size;
ElementPtr* tmpptr = read_ptr;
read_ptr = tmpptr->next.load(std::memory_order_acquire);
t = std::move(tmpptr->current);
tmpptr->next.store(nullptr);
@ -77,12 +76,14 @@ public:
return true;
}
bool PopWait(T& t) {
T PopWait() {
if (Empty()) {
std::unique_lock<std::mutex> lock(cv_mutex);
cv.wait(lock, [this]() { return !Empty(); });
}
return Pop(t);
T t;
Pop(t);
return t;
}
// not thread-safe
@ -148,8 +149,8 @@ public:
return spsc_queue.Pop(t);
}
bool PopWait(T& t) {
return spsc_queue.PopWait(t);
T PopWait() {
return spsc_queue.PopWait();
}
// not thread-safe