fix unsafe multithreaded boolean read/write

Change-Id: I60d6263ea9b0740fcce2a19e83a0398424cd0784

diff --git a/adaptors/common/vsync-monitor.h b/adaptors/common/vsync-monitor.h
index 601a584..f990d7b 100644 (file)
--- a/adaptors/common/vsync-monitor.h
+++ b/adaptors/common/vsync-monitor.h
@@ -89,8 +89,9 @@ private:
 
   int       mFileDescriptor;  ///< DRM dev node file descriptor
   drmVBlank mVBlankInfo;
-  bool      mUseHardwareVSync; ///< Whether to use hardware vsync
-  bool      mHardwareVSyncAvailable; ///< Whether hardware vsync is available
+  // NOTE cannot use booleans as these are used from multiple threads, must use variable with machine word size for atomic read/write
+  unsigned int mUseHardwareVSync; ///< Whether to use hardware vsync
+  unsigned int mHardwareVSyncAvailable; ///< Whether hardware vsync is available
 };
 
 } // namespace Adaptor

diff --git a/adaptors/tizen/vsync-monitor-tizen.cpp b/adaptors/tizen/vsync-monitor-tizen.cpp
index ea38d94..2f89812 100644 (file)
--- a/adaptors/tizen/vsync-monitor-tizen.cpp
+++ b/adaptors/tizen/vsync-monitor-tizen.cpp
@@ -39,6 +39,9 @@ namespace Adaptor
 
 namespace
 {
+// constants to keep code readability with unsigned int has to be used as boolean (due to multithreading)
+const unsigned int TRUE = 1u;
+const unsigned int FALSE = 0u;
 
 #if defined(DEBUG_ENABLED)
 Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_VSYNC_MONITOR");
@@ -59,7 +62,7 @@ void ScreenStatusChanged(keynode_t* node, void* data)
   //  - VCONFKEY_PM_STATE_LCDDIM : turn vsync off
   //  - VCONFKEY_PM_STATE_LCDOFF : turn vsync off
   //  - VCONFKEY_PM_STATE_SLEEP : turn vsync off
-  const bool screenOn( VCONFKEY_PM_STATE_NORMAL == status );
+  const unsigned int screenOn( VCONFKEY_PM_STATE_NORMAL == status );
 
   vsyncMonitor->SetHardwareVSyncAvailable( screenOn );
 
@@ -70,8 +73,8 @@ void ScreenStatusChanged(keynode_t* node, void* data)
 
 VSyncMonitor::VSyncMonitor()
 : mFileDescriptor( FD_NONE ),
-  mUseHardwareVSync( true ),
-  mHardwareVSyncAvailable( false )
+  mUseHardwareVSync( TRUE ),
+  mHardwareVSyncAvailable( FALSE )
 {
   vconf_notify_key_changed( VCONFKEY_PM_STATE, ScreenStatusChanged, this );
 }

diff --git a/adaptors/ubuntu/vsync-monitor-ubuntu.cpp b/adaptors/ubuntu/vsync-monitor-ubuntu.cpp
index 4379025..af8d4c9 100644 (file)
--- a/adaptors/ubuntu/vsync-monitor-ubuntu.cpp
+++ b/adaptors/ubuntu/vsync-monitor-ubuntu.cpp
@@ -37,6 +37,9 @@ namespace Adaptor
 
 namespace
 {
+// constants to keep code readability with unsigned int has to be used as boolean (due to multithreading)
+const unsigned int TRUE = 1u;
+const unsigned int FALSE = 0u;
 
 const int FD_NONE( -1 );
 
@@ -44,8 +47,8 @@ const int FD_NONE( -1 );
 
 VSyncMonitor::VSyncMonitor()
 : mFileDescriptor( FD_NONE ),
-  mUseHardwareVSync( false ),
-  mHardwareVSyncAvailable( false )
+  mUseHardwareVSync( FALSE ),
+  mHardwareVSyncAvailable( FALSE )
 {
 }