Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-04 03:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make global instance init thread-safe.

Browse Source 
Use local statics except for Visual C++ < 2015.
This commit is contained in:
Peter Johnson
2015-07-20 23:36:22 -07:00
parent 5df62ac172
commit b4c65dc210
5 changed files with 59 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Storage.h
View File

@@ -17,6 +17,7 @@
#include "llvm/StringMap.h"
#include "support/ConcurrentQueue.h"
#include "atomic_static.h"
#include "ntcore_cpp.h"
#include "SequenceNumber.h"
@@ -75,8 +76,8 @@ class Storage {
friend class StorageTest;
public:
static Storage& GetInstance() {
if (!m_instance) m_instance.reset(new Storage);
return *m_instance;
ATOMIC_STATIC(Storage, instance);
return instance;
}
~Storage();
@@ -128,7 +129,7 @@ class Storage {
UpdateQueue m_updates;
std::atomic_bool m_updates_enabled;
static std::unique_ptr<Storage> m_instance;
ATOMIC_STATIC_DECL(Storage)
};
} // namespace nt