oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/MultipleOutputs: reduce lock/unlock calls in EnableDisable()

Browse Source 
Use ScopeLock to manage the lock; don't unlock after obtaining the
"really_enabled" flag; keep the same lock during EnableWait() /
DisableWait().
This commit is contained in:
Max Kellermann
2016-12-14 07:54:05 +01:00
parent a9d7293818
commit ced3f320eb
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/output/MultipleOutputs.cxx
View File

@@ -44,7 +44,11 @@ MultipleOutputs::MultipleOutputs(MixerListener &_mixer_listener)
MultipleOutputs::~MultipleOutputs()
{
for (auto i : outputs) {
i->LockDisableWait();
{
const ScopeLock lock(i->mutex);
i->DisableWait();
}
i->Finish();
}
}
@@ -107,17 +111,13 @@ void
MultipleOutputs::EnableDisable()
{
for (auto ao : outputs) {
bool enabled;
const ScopeLock lock(ao->mutex);
ao->mutex.lock();
enabled = ao->really_enabled;
ao->mutex.unlock();
if (ao->enabled != enabled) {
if (ao->enabled != ao->really_enabled) {
if (ao->enabled)
ao->LockEnableWait();
ao->EnableWait();
else
ao->LockDisableWait();
ao->DisableWait();
}
}
}