From 822e1e1ffb40b7f24cc1a49dd57ba964c44dfcd8 Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Sun, 14 Jul 2013 17:13:01 +0200 Subject: [PATCH] Implemented caching for settings model. --- src/Config.h | 2 +- src/Dialog_MainWindow.cpp | 2 +- src/Main.cpp | 3 ++ src/Model_Settings.cpp | 97 ++++++++++++++++++++++++++++++++++++++++------- src/Model_Settings.h | 14 +++++++ 5 files changed, 103 insertions(+), 15 deletions(-) diff --git a/src/Config.h b/src/Config.h index e9f0abe6..ed8e964b 100644 --- a/src/Config.h +++ b/src/Config.h @@ -34,7 +34,7 @@ #define VER_LAMEXP_MINOR_LO 8 #define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_PATCH 1 -#define VER_LAMEXP_BUILD 1316 +#define VER_LAMEXP_BUILD 1318 #define VER_LAMEXP_CONFG 1288 /////////////////////////////////////////////////////////////////////////////// diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp index 8db381ed..f97c3e29 100644 --- a/src/Dialog_MainWindow.cpp +++ b/src/Dialog_MainWindow.cpp @@ -1714,7 +1714,7 @@ void MainWindow::encodeButtonClicked(void) writeTest.remove(); } } - + m_accepted = true; close(); } diff --git a/src/Main.cpp b/src/Main.cpp index 1b0ac81e..0151b4d1 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -174,6 +174,9 @@ static int lamexp_main(int argc, char* argv[]) iResult = QApplication::instance()->exec(); bAccepted = poMainWindow->isAccepted(); + //Sync settings + settingsModel->syncNow(); + //Show processing dialog if(bAccepted && (fileListModel->rowCount() > 0)) { diff --git a/src/Model_Settings.cpp b/src/Model_Settings.cpp index 2e356074..0a3aad83 100644 --- a/src/Model_Settings.cpp +++ b/src/Model_Settings.cpp @@ -35,30 +35,33 @@ #include #include #include +#include +#include +#include //////////////////////////////////////////////////////////// //Macros //////////////////////////////////////////////////////////// #define LAMEXP_MAKE_OPTION_I(OPT,DEF) \ -int SettingsModel::OPT(void) const { return m_settings->value(g_settingsId_##OPT, DEF).toInt(); } \ -void SettingsModel::OPT(int value) { m_settings->setValue(g_settingsId_##OPT, value); } \ -int SettingsModel::OPT##Default(void) { return DEF; } +int SettingsModel::OPT(void) const { return loadValue(g_settingsId_##OPT, (DEF)).toInt(); } \ +void SettingsModel::OPT(int value) { storeValue(g_settingsId_##OPT, value); } \ +int SettingsModel::OPT##Default(void) { return (DEF); } #define LAMEXP_MAKE_OPTION_S(OPT,DEF) \ -QString SettingsModel::OPT(void) const { return m_settings->value(g_settingsId_##OPT, DEF).toString().trimmed(); } \ -void SettingsModel::OPT(const QString &value) { m_settings->setValue(g_settingsId_##OPT, value); } \ -QString SettingsModel::OPT##Default(void) { return DEF; } +QString SettingsModel::OPT(void) const { return loadValue(g_settingsId_##OPT, (DEF)).toString().trimmed(); } \ +void SettingsModel::OPT(const QString &value) { storeValue(g_settingsId_##OPT, value); } \ +QString SettingsModel::OPT##Default(void) { return (DEF); } #define LAMEXP_MAKE_OPTION_B(OPT,DEF) \ -bool SettingsModel::OPT(void) const { return m_settings->value(g_settingsId_##OPT, DEF).toBool(); } \ -void SettingsModel::OPT(bool value) { m_settings->setValue(g_settingsId_##OPT, value); } \ -bool SettingsModel::OPT##Default(void) { return DEF; } +bool SettingsModel::OPT(void) const { return loadValue(g_settingsId_##OPT, (DEF)).toBool(); } \ +void SettingsModel::OPT(bool value) { storeValue(g_settingsId_##OPT, value); } \ +bool SettingsModel::OPT##Default(void) { return (DEF); } #define LAMEXP_MAKE_OPTION_U(OPT,DEF) \ -unsigned int SettingsModel::OPT(void) const { return m_settings->value(g_settingsId_##OPT, DEF).toUInt(); } \ -void SettingsModel::OPT(unsigned int value) { m_settings->setValue(g_settingsId_##OPT, value); } \ -unsigned int SettingsModel::OPT##Default(void) { return DEF; } +unsigned int SettingsModel::OPT(void) const { return loadValue(g_settingsId_##OPT, (DEF)).toUInt(); } \ +void SettingsModel::OPT(unsigned int value) { storeValue(g_settingsId_##OPT, value); } \ +unsigned int SettingsModel::OPT##Default(void) { return (DEF); } #define LAMEXP_MAKE_ID(DEC,STR) static const char *g_settingsId_##DEC = STR #define REMOVE_GROUP(OBJ,ID) OBJ->beginGroup(ID); OBJ->remove(""); OBJ->endGroup(); @@ -191,10 +194,17 @@ SettingsModel::SettingsModel(void) } } + //Create the cache + m_cache = new QHash(); + m_cacheLock = new QMutex(); + m_cacheDirty = new QSet(); + + //Create settings m_settings = new QSettings(configPath, QSettings::IniFormat); const QString groupKey = QString().sprintf("LameXP_%u%02u%05u", lamexp_version_major(), lamexp_version_minor(), lamexp_version_confg()); QStringList childGroups = m_settings->childGroups(); + //Clean-up settings while(!childGroups.isEmpty()) { QString current = childGroups.takeFirst(); @@ -212,6 +222,7 @@ SettingsModel::SettingsModel(void) REMOVE_GROUP(m_settings, current); } + //Setup settings m_settings->beginGroup(groupKey); m_settings->setValue(g_settingsId_versionNumber, QApplication::applicationVersion()); m_settings->sync(); @@ -223,6 +234,11 @@ SettingsModel::SettingsModel(void) SettingsModel::~SettingsModel(void) { + flushValues(); + + LAMEXP_DELETE(m_cache); + LAMEXP_DELETE(m_cacheDirty); + LAMEXP_DELETE(m_cacheLock); LAMEXP_DELETE(m_settings); LAMEXP_DELETE(m_defaultLanguage); } @@ -313,7 +329,7 @@ void SettingsModel::validate(void) void SettingsModel::syncNow(void) { - m_settings->sync(); + flushValues(); } //////////////////////////////////////////////////////////// @@ -423,6 +439,61 @@ QString SettingsModel::initDirectory(const QString &path) const } //////////////////////////////////////////////////////////// +// Cache support +//////////////////////////////////////////////////////////// + +void SettingsModel::storeValue(const QString &key, const QVariant &value) +{ + QMutexLocker lock(m_cacheLock); + + if(!m_cache->contains(key)) + { + m_cache->insert(key, value); + m_cacheDirty->insert(key); + } + else + { + if(m_cache->value(key) != value) + { + m_cache->insert(key, value); + m_cacheDirty->insert(key); + } + } +} + +QVariant SettingsModel::loadValue(const QString &key, const QVariant &defaultValue) const +{ + QMutexLocker lock(m_cacheLock); + + if(!m_cache->contains(key)) + { + const QVariant storedValue = m_settings->value(key, defaultValue); + m_cache->insert(key, storedValue); + } + + return m_cache->value(key, defaultValue); +} + +void SettingsModel::flushValues(void) +{ + QMutexLocker lock(m_cacheLock); + + if(!m_cacheDirty->isEmpty()) + { + QHash::ConstIterator iter; + for(iter = m_cache->constBegin(); iter != m_cache->constEnd(); iter++) + { + if(m_cacheDirty->contains(iter.key())) + { + m_settings->setValue(iter.key(), iter.value()); + } + } + m_settings->sync(); + m_cacheDirty->clear(); + } +} + +//////////////////////////////////////////////////////////// // Getter and Setter //////////////////////////////////////////////////////////// diff --git a/src/Model_Settings.h b/src/Model_Settings.h index 89a79c5f..9d4c4e15 100644 --- a/src/Model_Settings.h +++ b/src/Model_Settings.h @@ -23,6 +23,11 @@ class QSettings; class QString; +class QVariant; +class QMutex; + +template class QHash; +template class QSet; /////////////////////////////////////////////////////////////////////////////// @@ -169,7 +174,16 @@ public: private: QSettings *m_settings; + QHash *m_cache; + QSet *m_cacheDirty; + QMutex *m_cacheLock; + static QString *m_defaultLanguage; + + inline void storeValue(const QString &key, const QVariant &value); + inline QVariant loadValue(const QString &key, const QVariant &defaultValue) const; + inline void flushValues(void); + QString initDirectory(const QString &path) const; QString defaultLanguage(void) const; QString defaultDirectory(void) const; -- 2.11.0