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

ensure all accesses of audio pool num are guarded

Browse source
This commit is contained in:
Zach Pomerantz 2016-12-08 14:12:16 -05:00
parent eafbeb6d44
commit 5969c1eb06
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -92,8 +92,10 @@ void AudioMixerSlavePool::mix(ConstIter begin, ConstIter end, unsigned int frame
assert(_numFinished <= _numThreads); assert(_numFinished <= _numThreads);
return _numFinished == _numThreads; return _numFinished == _numThreads;
}); });
}
assert(_numStarted == _numThreads); assert(_numStarted == _numThreads);
}
assert(_queue.empty()); assert(_queue.empty());
#endif #endif
} }
@ -136,6 +138,8 @@ void AudioMixerSlavePool::resize(int numThreads) {
#else #else
qDebug("%s: set %d threads (was %d)", __FUNCTION__, numThreads, _numThreads); qDebug("%s: set %d threads (was %d)", __FUNCTION__, numThreads, _numThreads);
Lock lock(_mutex);
if (numThreads > _numThreads) { if (numThreads > _numThreads) {
// start new slaves // start new slaves
for (int i = 0; i < numThreads - _numThreads; ++i) { for (int i = 0; i < numThreads - _numThreads; ++i) {
@ -154,8 +158,6 @@ void AudioMixerSlavePool::resize(int numThreads) {
} }
// ...cycle them until they do stop... // ...cycle them until they do stop...
{
Lock lock(_mutex);
_numStopped = 0; _numStopped = 0;
while (_numStopped != (_numThreads - numThreads)) { while (_numStopped != (_numThreads - numThreads)) {
_numStarted = _numFinished = _numStopped; _numStarted = _numFinished = _numStopped;
@ -165,7 +167,6 @@ void AudioMixerSlavePool::resize(int numThreads) {
return _numFinished == _numThreads; return _numFinished == _numThreads;
}); });
} }
}
// ...wait for threads to finish... // ...wait for threads to finish...
slave = extraBegin; slave = extraBegin;
@ -181,7 +182,6 @@ void AudioMixerSlavePool::resize(int numThreads) {
} }
_numThreads = _numStarted = _numFinished = numThreads; _numThreads = _numStarted = _numFinished = numThreads;
#endif
assert(_numThreads == _slaves.size()); assert(_numThreads == _slaves.size());
#endif
} }