The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-23 03:11:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a race with multiple threads pushing data into circular queue

Browse Source 
If the 'end' changes when waiting for data to be consumed our 'waitNext' would be invalid leading to a deadlock.
This commit is contained in:
Billy Laws 2023-02-12 20:17:04 +00:00
parent f55b135243
commit 6ea1483c9a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/cpp/skyline/common/circular_queue.h
View File

@ -96,12 +96,15 @@ namespace skyline {
void Push(const Type &item) { void Push(const Type &item) {
Type *waitNext{}; Type *waitNext{};
Type *waitEnd{};
while (true) { while (true) {
if (waitNext) { if (waitNext) {
std::unique_lock consumeLock{consumptionMutex}; std::unique_lock consumeLock{consumptionMutex};
consumeCondition.wait(consumeLock, [=]() { return waitNext != start; });
consumeCondition.wait(consumeLock, [=]() { return waitNext != start || waitEnd != end; });
waitNext = nullptr; waitNext = nullptr;
waitEnd = nullptr;
} }
std::scoped_lock lock{productionMutex}; std::scoped_lock lock{productionMutex};
@ -109,6 +112,7 @@ namespace skyline {
next = (next == reinterpret_cast<Type *>(vector.end().base())) ? reinterpret_cast<Type *>(vector.begin().base()) : next; next = (next == reinterpret_cast<Type *>(vector.end().base())) ? reinterpret_cast<Type *>(vector.begin().base()) : next;
if (next == start) { if (next == start) {
waitNext = next; waitNext = next;
waitEnd = end;
continue; continue;
} }
*next = item; *next = item;