diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-07-11 15:09:19 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-07-11 15:09:24 -0400 |
| commit | 5ba77df15de92deb35bfd501d4635aed3236af30 (patch) | |
| tree | 3e0a1d4b217d9803957d833bddf9ad1265d932b3 /src/keystore.h | |
| parent | e538a952d5f05b9547df51d4c2a5b8858f3ab100 (diff) | |
| parent | 968b76f77ca51b9df737011ff486efbae9c8de81 (diff) | |
Merge #13114: wallet/keystore: Add Clang thread safety annotations for variables guarded by cs_KeyStore
968b76f77c Add missing cs_KeyStore lock (practicalswift)
4bcd5bb87d Add locking annotations for variables guarded by cs_KeyStore (practicalswift)
Pull request description:
* Add Clang thread safety annotations for variables guarded by `cs_KeyStore`
* Add missing `cs_KeyStore` lock
Tree-SHA512: 7d93513c2da0cd564b9f1e75aa5156a454a4133eb845020fde8872e685dd5758353e93c33364aeea4a812c08353a810494e503a5ce160cc5be0af5af4bb2e6d7
Diffstat (limited to 'src/keystore.h')
| -rw-r--r-- | src/keystore.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/keystore.h b/src/keystore.h index cd5ded9203..8dd2772f28 100644 --- a/src/keystore.h +++ b/src/keystore.h @@ -49,10 +49,10 @@ class CBasicKeyStore : public CKeyStore protected: mutable CCriticalSection cs_KeyStore; - KeyMap mapKeys; - WatchKeyMap mapWatchKeys; - ScriptMap mapScripts; - WatchOnlySet setWatchOnly; + KeyMap mapKeys GUARDED_BY(cs_KeyStore); + WatchKeyMap mapWatchKeys GUARDED_BY(cs_KeyStore); + ScriptMap mapScripts GUARDED_BY(cs_KeyStore); + WatchOnlySet setWatchOnly GUARDED_BY(cs_KeyStore); void ImplicitlyLearnRelatedKeyScripts(const CPubKey& pubkey) EXCLUSIVE_LOCKS_REQUIRED(cs_KeyStore); |