diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2014-07-21 16:36:24 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-07-23 17:50:23 +0200 |
commit | cfaf851e268dac95cb140fbffc1233981ce48d4c (patch) | |
tree | 0a8ae098f6636fa301c48c3c17a4e9fefdb1e184 /src/corelib/plugin/qlibrary.cpp | |
parent | 800d0076e0adaeb751f7040fbd7476292e1a2af9 (diff) |
Fix a few more race conditions with QLibrary::LoadHints
This commit makes replaces the loadHints member with a setter, a getter
and an atomic variable. The setter will not set anything if the library
has already been loaded.
Task-number: QTBUG-39642
Change-Id: Ibb7692f16d80211b52aaf4dc88db1a989738a24d
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src/corelib/plugin/qlibrary.cpp')
-rw-r--r-- | src/corelib/plugin/qlibrary.cpp | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp index 50281b632a..ae53dcdc32 100644 --- a/src/corelib/plugin/qlibrary.cpp +++ b/src/corelib/plugin/qlibrary.cpp @@ -485,9 +485,9 @@ inline void QLibraryStore::releaseLibrary(QLibraryPrivate *lib) QLibraryPrivate::QLibraryPrivate(const QString &canonicalFileName, const QString &version, QLibrary::LoadHints loadHints) : pHnd(0), fileName(canonicalFileName), fullVersion(version), instance(0), - loadHints(loadHints), libraryRefCount(0), libraryUnloadCount(0), pluginState(MightBeAPlugin) { + loadHintsInt.store(loadHints); if (canonicalFileName.isEmpty()) errorString = QLibrary::tr("The shared library was not found."); } @@ -508,7 +508,7 @@ void QLibraryPrivate::mergeLoadHints(QLibrary::LoadHints lh) if (pHnd) return; - loadHints = lh; + loadHintsInt.store(lh); } QFunctionPointer QLibraryPrivate::resolve(const char *symbol) @@ -518,6 +518,12 @@ QFunctionPointer QLibraryPrivate::resolve(const char *symbol) return resolve_sys(symbol); } +void QLibraryPrivate::setLoadHints(QLibrary::LoadHints lh) +{ + // this locks a global mutex + QMutexLocker lock(&qt_library_mutex); + mergeLoadHints(lh); +} bool QLibraryPrivate::load() { @@ -914,13 +920,12 @@ void QLibrary::setFileName(const QString &fileName) { QLibrary::LoadHints lh; if (d) { - lh = d->loadHints; + lh = d->loadHints(); d->release(); d = 0; did_load = false; } - d = QLibraryPrivate::findOrCreate(fileName); - d->loadHints = lh; + d = QLibraryPrivate::findOrCreate(fileName, QString(), lh); } QString QLibrary::fileName() const @@ -943,13 +948,12 @@ void QLibrary::setFileNameAndVersion(const QString &fileName, int verNum) { QLibrary::LoadHints lh; if (d) { - lh = d->loadHints; + lh = d->loadHints(); d->release(); d = 0; did_load = false; } - d = QLibraryPrivate::findOrCreate(fileName, verNum >= 0 ? QString::number(verNum) : QString()); - d->loadHints = lh; + d = QLibraryPrivate::findOrCreate(fileName, verNum >= 0 ? QString::number(verNum) : QString(), lh); } /*! @@ -965,13 +969,12 @@ void QLibrary::setFileNameAndVersion(const QString &fileName, const QString &ver { QLibrary::LoadHints lh; if (d) { - lh = d->loadHints; + lh = d->loadHints(); d->release(); d = 0; did_load = false; } - d = QLibraryPrivate::findOrCreate(fileName, version); - d->loadHints = lh; + d = QLibraryPrivate::findOrCreate(fileName, version, lh); } /*! @@ -1102,6 +1105,12 @@ QString QLibrary::errorString() const By default, none of these flags are set, so libraries will be loaded with lazy symbol resolution, and will not export external symbols for resolution in other dynamically-loaded libraries. + + \note Setting this property after the library has been loaded has no effect + and loadHints() will not reflect those changes. + + \note This property is shared among all QLibrary instances that refer to + the same library. */ void QLibrary::setLoadHints(LoadHints hints) { @@ -1109,12 +1118,12 @@ void QLibrary::setLoadHints(LoadHints hints) d = QLibraryPrivate::findOrCreate(QString()); // ugly, but we need a d-ptr d->errorString.clear(); } - d->loadHints = hints; + d->setLoadHints(hints); } QLibrary::LoadHints QLibrary::loadHints() const { - return d ? d->loadHints : (QLibrary::LoadHints)0; + return d ? d->loadHints() : QLibrary::LoadHints(); } /* Internal, for debugging */ |