From e8963749a7ffec3096478a4104a08bff4aaf3742 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 24 Aug 2012 09:47:55 +0200 Subject: QNativeWifiEnginePlugin: replace a volatile bool with an atomic int Since there is non-atomic data that is protected by 'triedResolve', the (outer) read from triedResolve needs to have acquire, and the store needs to have release semantics. The release implied by the mutex unlock is not good enough because it only synchronises-with the locking of the same mutex, which not all threads execute. Change-Id: I90b62c4c0213472ecf2b95a1674a1c6c79dc3786 Reviewed-by: Thiago Macieira Reviewed-by: Shane Kearns --- src/plugins/bearer/nativewifi/main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/plugins/bearer/nativewifi') diff --git a/src/plugins/bearer/nativewifi/main.cpp b/src/plugins/bearer/nativewifi/main.cpp index a1ecd22d07..e431e82c79 100644 --- a/src/plugins/bearer/nativewifi/main.cpp +++ b/src/plugins/bearer/nativewifi/main.cpp @@ -56,14 +56,14 @@ QT_BEGIN_NAMESPACE static void resolveLibrary() { - static volatile bool triedResolve = false; + static QBasicAtomicInt triedResolve = Q_BASIC_ATOMIC_INITIALIZER(false); - if (!triedResolve) { + if (!triedResolve.loadAcquire()) { #ifndef QT_NO_THREAD QMutexLocker locker(QMutexPool::globalInstanceGet(&local_WlanOpenHandle)); #endif - if (!triedResolve) { + if (!triedResolve.load()) { local_WlanOpenHandle = (WlanOpenHandleProto) QLibrary::resolve(QLatin1String("wlanapi.dll"), "WlanOpenHandle"); local_WlanRegisterNotification = (WlanRegisterNotificationProto) @@ -85,7 +85,7 @@ static void resolveLibrary() local_WlanCloseHandle = (WlanCloseHandleProto) QLibrary::resolve(QLatin1String("wlanapi.dll"), "WlanCloseHandle"); - triedResolve = true; + triedResolve.storeRelease(true); } } } -- cgit v1.2.3