From 6882c3cc9f4e53f3caae1cce658e66245f4a40e0 Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Wed, 16 Dec 2009 16:05:01 +0100
Subject: [PATCH] Maemo: Fix "race condition" in singleton access.
---
.../qt-maemo/maemodeviceconfigurations.cpp | 18 ++++++------------
.../qt-maemo/maemodeviceconfigurations.h | 2 +-
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
index 872e45d3f6a..79afcc18b47 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
@@ -87,7 +87,8 @@ MaemoDeviceConfigurations::DeviceConfig::DeviceConfig(const QString &name)
{
}
-MaemoDeviceConfigurations::DeviceConfig::DeviceConfig(const QSettings &settings)
+MaemoDeviceConfigurations::DeviceConfig::DeviceConfig(const QSettings &settings,
+ quint64 &nextId)
: name(settings.value(NameKey).toString()),
type(static_cast<DeviceType>(settings.value(TypeKey, Physical).toInt())),
host(settings.value(HostKey).toString()),
@@ -97,11 +98,10 @@ MaemoDeviceConfigurations::DeviceConfig::DeviceConfig(const QSettings &settings)
pwd(settings.value(PasswordKey).toString()),
keyFile(settings.value(KeyFileKey).toString()),
timeout(settings.value(TimeoutKey, 30).toInt()),
- internalId(settings.value(InternalIdKey, MaemoDeviceConfigurations::instance().m_nextId).toInt())
+ internalId(settings.value(InternalIdKey, nextId).toInt())
{
- if (internalId == MaemoDeviceConfigurations::instance().m_nextId)
- ++MaemoDeviceConfigurations::instance().m_nextId;
- qDebug("%s: name = %s, id = %llu", Q_FUNC_INFO, qPrintable(name), internalId);
+ if (internalId == nextId)
+ ++nextId;
}
MaemoDeviceConfigurations::DeviceConfig::DeviceConfig()
@@ -146,7 +146,6 @@ void MaemoDeviceConfigurations::save()
{
QSettings *settings = Core::ICore::instance()->settings();
settings->beginGroup(SettingsGroup);
- qDebug("Writing next id: %llu", m_nextId);
settings->setValue(IdCounterKey, m_nextId);
settings->beginWriteArray(ConfigListKey, m_devConfigs.count());
for (int i = 0; i < m_devConfigs.count(); ++i) {
@@ -169,11 +168,10 @@ void MaemoDeviceConfigurations::load()
QSettings *settings = Core::ICore::instance()->settings();
settings->beginGroup(SettingsGroup);
m_nextId = settings->value(IdCounterKey, 1).toULongLong();
- qDebug("Read next id: %llu", m_nextId);
int count = settings->beginReadArray(ConfigListKey);
for (int i = 0; i < count; ++i) {
settings->setArrayIndex(i);
- m_devConfigs.append(DeviceConfig(*settings));
+ m_devConfigs.append(DeviceConfig(*settings, m_nextId));
}
settings->endArray();
settings->endGroup();
@@ -181,21 +179,17 @@ void MaemoDeviceConfigurations::load()
MaemoDeviceConfigurations::DeviceConfig MaemoDeviceConfigurations::find(const QString &name) const
{
- qDebug("%s: Looking for name %s", Q_FUNC_INFO, qPrintable(name));
QList<DeviceConfig>::ConstIterator resultIt =
std::find_if(m_devConfigs.constBegin(), m_devConfigs.constEnd(),
DevConfNameMatcher(name));
- qDebug("Found: %d", resultIt != m_devConfigs.constEnd());
return resultIt == m_devConfigs.constEnd() ? DeviceConfig() : *resultIt;
}
MaemoDeviceConfigurations::DeviceConfig MaemoDeviceConfigurations::find(int id) const
{
- qDebug("%s: Looking for id %d", Q_FUNC_INFO, id);
QList<DeviceConfig>::ConstIterator resultIt =
std::find_if(m_devConfigs.constBegin(), m_devConfigs.constEnd(),
DevConfIdMatcher(id));
- qDebug("Found: %d", resultIt != m_devConfigs.constEnd());
return resultIt == m_devConfigs.constEnd() ? DeviceConfig() : *resultIt;
}
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.h b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.h
index 6a224eba41d..c3f4f97ed70 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.h
@@ -59,7 +59,7 @@ public:
enum AuthType { Password, Key };
DeviceConfig();
DeviceConfig(const QString &name);
- DeviceConfig(const QSettings &settings);
+ DeviceConfig(const QSettings &settings, quint64 &nextId);
void save(QSettings &settings) const;
bool isValid() const;
QString name;
--
GitLab