Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 19:34:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

avoid pessimizing audio slave lock contention

Browse source
This commit is contained in:
Zach Pomerantz 2016-12-08 01:53:25 +00:00
parent 6e0ad5a7ed
commit 3508e71753
1 changed files with 12 additions and 13 deletions

25
assignment-client/src/audio/AudioMixerSlavePool.cpp
View file

@ -27,7 +27,7 @@ void AudioMixerSlaveThread::run() {
bool stopping = _stop;
notify(stopping);
if (stopping) {
return;
break;
}
}
}
@ -80,14 +80,13 @@ void AudioMixerSlavePool::mix(ConstIter begin, ConstIter end, unsigned int frame
_queue.emplace(node);
});
// mix
_numStarted = _numFinished = 0;
_slaveCondition.notify_all();
// wait
{
Lock lock(_mutex);
// mix
_numStarted = _numFinished = 0;
_slaveCondition.notify_all();
// wait
_poolCondition.wait(lock, [&] {
assert(_numFinished <= _numThreads);
return _numFinished == _numThreads;
@ -154,12 +153,12 @@ void AudioMixerSlavePool::resize(int numThreads) {
}
// ...cycle them until they do stop...
{
Lock lock(_mutex);
_numStopped = 0;
while (_numStopped != (_numThreads - numThreads)) {
_numStarted = _numFinished = _numStopped;
_slaveCondition.notify_all();
_numStopped = 0;
while (_numStopped != (_numThreads - numThreads)) {
_numStarted = _numFinished = _numStopped;
_slaveCondition.notify_all();
{
Lock lock(_mutex);
_poolCondition.wait(lock, [&] {
assert(_numFinished <= _numThreads);
return _numFinished == _numThreads;