Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed empty condition signal to be under queue lock #93

Merged
merged 1 commit into from
May 23, 2019
Merged

Changed empty condition signal to be under queue lock #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions quantum/impl/quantum_task_queue_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,10 +356,6 @@ TaskQueue::TaskListIter TaskQueue::advance()
acquireWaiting();
}
_isAdvanced = false; //reset flag
if (_queueIt == _runQueue.end())
{
signalEmptyCondition(true);
}
return _queueIt;
}

Expand All @@ -373,20 +369,24 @@ inline
void TaskQueue::acquireWaiting()
{
//========================= LOCKED SCOPE =========================
SpinLock::Guard lock(_spinlock);
bool isEmpty = _runQueue.empty();
if (_waitQueue.empty())
{
if (isEmpty)
{
signalEmptyCondition(true);
}
_queueIt = _runQueue.begin();
return;
}
bool isEmpty = _runQueue.empty();
if (!isEmpty)
{
//rewind by one since we are at end()
--_queueIt;
}
{
//splice wait queue unto run queue.
SpinLock::Guard lock(_spinlock);
_runQueue.splice(_runQueue.end(), _waitQueue);
}
if (!isEmpty)
Expand Down