diff options
author | MarcoFalke <falke.marco@gmail.com> | 2018-05-15 08:42:47 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2018-05-15 08:42:49 -0400 |
commit | 13da2899ae42d48547e5cb491ea6aba4882b3306 (patch) | |
tree | d45cb8d437091944ea340b62aa9794e9c9929c0b /src | |
parent | 1d4662f5dcf64bd8cbab7386616461b570e93e67 (diff) | |
parent | 244f4baf0f033b01cca24627bd09d17310f5ed14 (diff) |
Merge #13125: scheduler: Add Clang thread safety annotations for variables guarded by m_cs_callbacks_pending
244f4baf0f scheduler: Add Clang thread safety annotations for variables guarded by m_cs_callbacks_pending (practicalswift)
Pull request description:
Add Clang thread safety annotations for variables guarded by `m_cs_callbacks_pending`.
Tree-SHA512: 5c4aa14d1918ff119f945084820f7c1c5618e2a38d8bea8ebbfa6acddbccdacfea81fa61f1f796f8b1fcf57f5e3112da63b9bd0fa97fc9a9ef427fc361945e02
Diffstat (limited to 'src')
-rw-r--r-- | src/scheduler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/scheduler.h b/src/scheduler.h index a41838a295..7169dceee5 100644 --- a/src/scheduler.h +++ b/src/scheduler.h @@ -95,8 +95,8 @@ private: CScheduler *m_pscheduler; CCriticalSection m_cs_callbacks_pending; - std::list<std::function<void (void)>> m_callbacks_pending; - bool m_are_callbacks_running = false; + std::list<std::function<void (void)>> m_callbacks_pending GUARDED_BY(m_cs_callbacks_pending); + bool m_are_callbacks_running GUARDED_BY(m_cs_callbacks_pending) = false; void MaybeScheduleProcessQueue(); void ProcessQueue(); |