Merge #13127: wallet: Add Clang thread safety annotations for variables guarded by cs_db

MarcoFalke · MarcoFalke · commit 19a3a9e8fba7 · 2018-05-14T09:56:47.000-04:00
56921f9 wallet: Add Clang thread safety annotations for variables guarded by cs_db (practicalswift) Pull request description: Add Clang thread safety annotations for variables guarded by `cs_db`. Tree-SHA512: d59723598e918143f36408b4f49d31138b5d8968ba191472f6a207a63af147627f21e48fd6cc1606dd901d8a58183271e65ea4346a380db3c09e404764a28063
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
@@ -53,7 +53,7 @@ void CheckUniqueFileid(const BerkeleyEnvironment& env, const std::string& filena
 }
 
 CCriticalSection cs_db;
-std::map<std::string, BerkeleyEnvironment> g_dbenvs; //!< Map from directory name to open db environment.
+std::map<std::string, BerkeleyEnvironment> g_dbenvs GUARDED_BY(cs_db); //!< Map from directory name to open db environment.
 } // namespace
 
 BerkeleyEnvironment* GetWalletEnv(const fs::path& wallet_path, std::string& database_filename)

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ void CheckUniqueFileid(const BerkeleyEnvironment& env, const std::string& filena`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`CCriticalSection cs_db;`
`56`		`-std::map<std::string, BerkeleyEnvironment> g_dbenvs; //!< Map from directory name to open db environment.`
	`56`	`+std::map<std::string, BerkeleyEnvironment> g_dbenvs GUARDED_BY(cs_db); //!< Map from directory name to open db environment.`
`57`	`57`	`} // namespace`
`58`	`58`
`59`	`59`	`BerkeleyEnvironment* GetWalletEnv(const fs::path& wallet_path, std::string& database_filename)`