mirror/nzbget
1
0
Fork 0
mirror of https://github.com/nzbget/nzbget.git synced 2026-06-14 06:34:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

#185: use guards with private mutexes

Browse Source 
Use guard objects to automatically unlock private mutexes when leaving
current scope.
This commit is contained in:
Andrey Prygunkov
2016-03-16 22:37:19 +01:00
parent 65e0238aa2
commit f973388879
17 changed files with 180 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
daemon/util/Script.cpp
View File

@@ -153,9 +153,8 @@ ScriptController::ScriptController()
{
ResetEnv();
m_runningMutex.Lock();
Guard guard(m_runningMutex);
m_runningScripts.push_back(this);
m_runningMutex.Unlock();
}
ScriptController::~ScriptController()
@@ -165,9 +164,8 @@ ScriptController::~ScriptController()
void ScriptController::UnregisterRunningScript()
{
m_runningMutex.Lock();
Guard guard(m_runningMutex);
m_runningScripts.erase(std::remove(m_runningScripts.begin(), m_runningScripts.end(), this), m_runningScripts.end());
m_runningMutex.Unlock();
}
void ScriptController::ResetEnv()
@@ -641,7 +639,7 @@ void ScriptController::Terminate()
void ScriptController::TerminateAll()
{
m_runningMutex.Lock();
Guard guard(m_runningMutex);
for (ScriptController* script : m_runningScripts)
{
if (script->m_processId && !script->m_detached)
@@ -649,7 +647,6 @@ void ScriptController::TerminateAll()
script->Terminate();
}
}
m_runningMutex.Unlock();
}
void ScriptController::Detach()