AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove use of QMutexPool in Windows code resolving libraries

Browse Source 
We can use Q_GLOBAL_STATIC for this, which is thread safe.

Change-Id: Ifea6e497f11a461db432ffff1449afe930f72d5d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
Thiago Macieira 2016-04-28 18:22:50 -07:00
parent 7982dfe6e6
commit aa3391e474
1 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/corelib/io/qfilesystemengine_win.cpp
View File

@ -48,7 +48,6 @@
#include "qfile.h" #include "qfile.h"
#include "qdir.h" #include "qdir.h"
#include "private/qmutexpool_p.h"
#include "qvarlengtharray.h" #include "qvarlengtharray.h"
#include "qdatetime.h" #include "qdatetime.h"
#include "qt_windows.h" #include "qt_windows.h"
@ -178,6 +177,7 @@ static TRUSTEE_W worldTrusteeW;
static PSID currentUserSID = 0; static PSID currentUserSID = 0;
static PSID worldSID = 0; static PSID worldSID = 0;
namespace {
/* /*
Deletes the allocated SIDs during global static cleanup Deletes the allocated SIDs during global static cleanup
*/ */
@ -201,25 +201,10 @@ SidCleanup::~SidCleanup()
Q_GLOBAL_STATIC(SidCleanup, initSidCleanup) Q_GLOBAL_STATIC(SidCleanup, initSidCleanup)
static void resolveLibs() struct LibResolver
{ {
static bool triedResolve = false; LibResolver()
if (!triedResolve) { {
// need to resolve the security info functions
// protect initialization
#ifndef QT_NO_THREAD
QMutexLocker locker(QMutexPool::globalInstanceGet(&triedResolve));
// check triedResolve again, since another thread may have already
// done the initialization
if (triedResolve) {
// another thread did initialize the security function pointers,
// so we shouldn't do it again.
return;
}
#endif
triedResolve = true;
HINSTANCE advapiHnd = QSystemLibrary::load(L"advapi32"); HINSTANCE advapiHnd = QSystemLibrary::load(L"advapi32");
if (advapiHnd) { if (advapiHnd) {
ptrGetNamedSecurityInfoW = (PtrGetNamedSecurityInfoW)GetProcAddress(advapiHnd, "GetNamedSecurityInfoW"); ptrGetNamedSecurityInfoW = (PtrGetNamedSecurityInfoW)GetProcAddress(advapiHnd, "GetNamedSecurityInfoW");
@ -266,9 +251,13 @@ static void resolveLibs()
if (userenvHnd) if (userenvHnd)
ptrGetUserProfileDirectoryW = (PtrGetUserProfileDirectoryW)GetProcAddress(userenvHnd, "GetUserProfileDirectoryW"); ptrGetUserProfileDirectoryW = (PtrGetUserProfileDirectoryW)GetProcAddress(userenvHnd, "GetUserProfileDirectoryW");
} }
} };
Q_GLOBAL_STATIC(LibResolver, resolveLibs)
} // anonymous namespace
#endif // QT_NO_LIBRARY #endif // QT_NO_LIBRARY
QT_BEGIN_INCLUDE_NAMESPACE
typedef DWORD (WINAPI *PtrNetShareEnum)(LPWSTR, DWORD, LPBYTE*, DWORD, LPDWORD, LPDWORD, LPDWORD); typedef DWORD (WINAPI *PtrNetShareEnum)(LPWSTR, DWORD, LPBYTE*, DWORD, LPDWORD, LPDWORD, LPDWORD);
static PtrNetShareEnum ptrNetShareEnum = 0; static PtrNetShareEnum ptrNetShareEnum = 0;
typedef DWORD (WINAPI *PtrNetApiBufferFree)(LPVOID); typedef DWORD (WINAPI *PtrNetApiBufferFree)(LPVOID);
@ -278,19 +267,13 @@ typedef struct _SHARE_INFO_1 {
DWORD shi1_type; DWORD shi1_type;
LPWSTR shi1_remark; LPWSTR shi1_remark;
} SHARE_INFO_1; } SHARE_INFO_1;
QT_END_INCLUDE_NAMESPACE
namespace {
static bool resolveUNCLibs() struct UNCLibResolver
{ {
static bool triedResolve = false; UNCLibResolver()
if (!triedResolve) { {
#ifndef QT_NO_THREAD
QMutexLocker locker(QMutexPool::globalInstanceGet(&triedResolve));
if (triedResolve) {
return ptrNetShareEnum && ptrNetApiBufferFree;
}
#endif
triedResolve = true;
#if !defined(Q_OS_WINRT) #if !defined(Q_OS_WINRT)
HINSTANCE hLib = QSystemLibrary::load(L"Netapi32"); HINSTANCE hLib = QSystemLibrary::load(L"Netapi32");
if (hLib) { if (hLib) {
@ -300,6 +283,13 @@ static bool resolveUNCLibs()
} }
#endif // !Q_OS_WINRT #endif // !Q_OS_WINRT
} }
};
Q_GLOBAL_STATIC(UNCLibResolver, uncLibResolver)
} // anonymous namespace
static bool resolveUNCLibs()
{
uncLibResolver();
return ptrNetShareEnum && ptrNetApiBufferFree; return ptrNetShareEnum && ptrNetApiBufferFree;
} }