foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-08 10:31:50 -05:00
Code Issues Activity

Add lock annotations (cs_args)

Browse source
This commit is contained in:
practicalswift 2018-08-29 22:33:33 +02:00
parent db5e9d3c88
commit d58dc9f943
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/util.cpp
View file

@ -216,7 +216,7 @@ public:
/** Determine whether to use config settings in the default section, /** Determine whether to use config settings in the default section,
* See also comments around ArgsManager::ArgsManager() below. */ * See also comments around ArgsManager::ArgsManager() below. */
static inline bool UseDefaultSection(const ArgsManager& am, const std::string& arg) static inline bool UseDefaultSection(const ArgsManager& am, const std::string& arg) EXCLUSIVE_LOCKS_REQUIRED(am.cs_args)
{ {
return (am.m_network == CBaseChainParams::MAIN || am.m_network_only_args.count(arg) == 0); return (am.m_network == CBaseChainParams::MAIN || am.m_network_only_args.count(arg) == 0);
} }
@ -295,7 +295,7 @@ public:
/* Special test for -testnet and -regtest args, because we /* Special test for -testnet and -regtest args, because we
* don't want to be confused by craziness like "[regtest] testnet=1" * don't want to be confused by craziness like "[regtest] testnet=1"
*/ */
static inline bool GetNetBoolArg(const ArgsManager &am, const std::string& net_arg) static inline bool GetNetBoolArg(const ArgsManager &am, const std::string& net_arg) EXCLUSIVE_LOCKS_REQUIRED(am.cs_args)
{ {
std::pair<bool,std::string> found_result(false,std::string()); std::pair<bool,std::string> found_result(false,std::string());
found_result = GetArgHelper(am.m_override_args, net_arg, true); found_result = GetArgHelper(am.m_override_args, net_arg, true);

10
src/util.h
View file

@ -142,11 +142,11 @@ protected:
}; };
mutable CCriticalSection cs_args; mutable CCriticalSection cs_args;
std::map<std::string, std::vector<std::string>> m_override_args; std::map<std::string, std::vector<std::string>> m_override_args GUARDED_BY(cs_args);
std::map<std::string, std::vector<std::string>> m_config_args; std::map<std::string, std::vector<std::string>> m_config_args GUARDED_BY(cs_args);
std::string m_network; std::string m_network GUARDED_BY(cs_args);
std::set<std::string> m_network_only_args; std::set<std::string> m_network_only_args GUARDED_BY(cs_args);
std::map<OptionsCategory, std::map<std::string, Arg>> m_available_args; std::map<OptionsCategory, std::map<std::string, Arg>> m_available_args GUARDED_BY(cs_args);
bool ReadConfigStream(std::istream& stream, std::string& error, bool ignore_invalid_keys = false); bool ReadConfigStream(std::istream& stream, std::string& error, bool ignore_invalid_keys = false);