diff options
author | MarcoFalke <falke.marco@gmail.com> | 2020-01-07 23:14:15 +0700 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2020-01-15 01:43:46 +0700 |
commit | 6cbe6209646db8914b87bf6edbc18c6031a16f1e (patch) | |
tree | 1b30ad3bd585cc3e91cf036943c195b25dfd4a19 /src/wallet/db.cpp | |
parent | ceb789cf3a9075729efa07f5114ce0369d8606c3 (diff) |
scripted-diff: Replace CCriticalSection with RecursiveMutex
-BEGIN VERIFY SCRIPT-
# Delete outdated alias for RecursiveMutex
sed -i -e '/CCriticalSection/d' ./src/sync.h
# Replace use of outdated alias with RecursiveMutex
sed -i -e 's/CCriticalSection/RecursiveMutex/g' $(git grep -l CCriticalSection)
-END VERIFY SCRIPT-
Diffstat (limited to 'src/wallet/db.cpp')
-rw-r--r-- | src/wallet/db.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp index 79825847c8..03a3fba767 100644 --- a/src/wallet/db.cpp +++ b/src/wallet/db.cpp @@ -44,7 +44,7 @@ void CheckUniqueFileid(const BerkeleyEnvironment& env, const std::string& filena } } -CCriticalSection cs_db; +RecursiveMutex cs_db; std::map<std::string, std::weak_ptr<BerkeleyEnvironment>> g_dbenvs GUARDED_BY(cs_db); //!< Map from directory name to db environment. } // namespace @@ -650,7 +650,7 @@ void BerkeleyEnvironment::ReloadDbEnv() { // Make sure that no Db's are in use AssertLockNotHeld(cs_db); - std::unique_lock<CCriticalSection> lock(cs_db); + std::unique_lock<RecursiveMutex> lock(cs_db); m_db_in_use.wait(lock, [this](){ for (auto& count : mapFileUseCount) { if (count.second > 0) return false; |