feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Environment: Make systemEnvironment() thread safe

Browse Source 
Fixes: QTCREATORBUG-26805
Change-Id: I839995699ffd25579a6a77405331a9802edaf7f1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2022-10-20 15:42:59 +02:00
parent ea53baf897
commit e23e5faa82
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/utils/environment.cpp
View File

@@ -4,18 +4,18 @@
#include "environment.h" #include "environment.h"
#include "algorithm.h" #include "algorithm.h"
#include "fileutils.h"
#include "qtcassert.h" #include "qtcassert.h"
#include <QDir> #include <QDir>
#include <QProcessEnvironment> #include <QProcessEnvironment>
#include <QReadWriteLock>
#include <QSet> #include <QSet>
namespace Utils { namespace Utils {
static QReadWriteLock s_envMutex;
Q_GLOBAL_STATIC_WITH_ARGS(Environment, staticSystemEnvironment, Q_GLOBAL_STATIC_WITH_ARGS(Environment, staticSystemEnvironment,
(QProcessEnvironment::systemEnvironment().toStringList())) (QProcessEnvironment::systemEnvironment().toStringList()))
Q_GLOBAL_STATIC(QVector<EnvironmentProvider>, environmentProviders) Q_GLOBAL_STATIC(QVector<EnvironmentProvider>, environmentProviders)
NameValueItems Environment::diff(const Environment &other, bool checkAppendPrepend) const NameValueItems Environment::diff(const Environment &other, bool checkAppendPrepend) const
@@ -120,6 +120,7 @@ void Environment::prependOrSetLibrarySearchPaths(const FilePaths &values)
Environment Environment::systemEnvironment() Environment Environment::systemEnvironment()
{ {
QReadLocker lock(&s_envMutex);
return *staticSystemEnvironment(); return *staticSystemEnvironment();
} }
@@ -296,11 +297,13 @@ FilePaths Environment::pathListValue(const QString &varName) const
void Environment::modifySystemEnvironment(const EnvironmentItems &list) void Environment::modifySystemEnvironment(const EnvironmentItems &list)
{ {
QWriteLocker lock(&s_envMutex);
staticSystemEnvironment->modify(list); staticSystemEnvironment->modify(list);
} }
void Environment::setSystemEnvironment(const Environment &environment) void Environment::setSystemEnvironment(const Environment &environment)
{ {
QWriteLocker lock(&s_envMutex);
*staticSystemEnvironment = environment; *staticSystemEnvironment = environment;
} }