Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-29 02:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

artf4107: GetInstance() calls are now atomic

Browse Source 
C++11 guarantees construction of static variables to be atomic, so this patch takes advantage of that.

Change-Id: I4a3db0f19c5fa5461fef3b6b63d7b8fec596c962
This commit is contained in:
Tyler Veness
2015-06-24 04:25:10 -07:00
parent 368ad30d37
commit faedfa6ed4
11 changed files with 14 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wpilibc/wpilibC++Devices/src/DriverStation.cpp
View File

@@ -28,7 +28,6 @@ const double JOYSTICK_UNPLUGGED_MESSAGE_INTERVAL = 1.0;
Log().Get(level)
const uint32_t DriverStation::kJoystickPorts;
DriverStation* DriverStation::m_instance = nullptr;
/**
* DriverStation constructor.
@@ -73,7 +72,6 @@ DriverStation::DriverStation() {
DriverStation::~DriverStation() {
m_task.Stop();
m_instance = nullptr;
deleteMultiWait(m_waitForDataSem);
// Unregister our semaphore.
HALSetNewDataSem(nullptr);
@@ -111,10 +109,8 @@ void DriverStation::Run() {
* @return Pointer to the DS instance
*/
DriverStation* DriverStation::GetInstance() {
if (m_instance == nullptr) {
m_instance = new DriverStation();
}
return m_instance;
static DriverStation instance;
return &instance;
}
/**