kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-18 22:00:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Lock-related improvement in ElementsCollectionCache.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@1365 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2011-10-08 21:51:38 +00:00
parent 282ac82ead
commit 883da2a9c0
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sources/elementscollectioncache.cpp
View File

@@ -17,7 +17,7 @@ ElementsCollectionCache::ElementsCollectionCache(const QString &database_path, Q
// initialize the cache SQLite database // initialize the cache SQLite database
static int cache_instances = 0; static int cache_instances = 0;
QString connection_name = QString("ElementsCollectionCache-%1").arg(cache_instances++); QString connection_name = QString("ElementsCollectionCache-%1").arg(cache_instances++);
cache_db_ = QSqlDatabase::addDatabase("QSQLITE", connection_name ); cache_db_ = QSqlDatabase::addDatabase("QSQLITE", connection_name);
cache_db_.setDatabaseName(database_path); cache_db_.setDatabaseName(database_path);
if (!cache_db_.open()) { if (!cache_db_.open()) {
qDebug() << "Unable to open the SQLite database " << database_path << " as " << connection_name << ": " << cache_db_.lastError(); qDebug() << "Unable to open the SQLite database " << database_path << " as " << connection_name << ": " << cache_db_.lastError();
@@ -108,7 +108,11 @@ void ElementsCollectionCache::endCollection(ElementsCollection *collection) {
bool use_cache = cache_db_.isOpen() && collection -> isCacheable(); bool use_cache = cache_db_.isOpen() && collection -> isCacheable();
if (use_cache) { if (use_cache) {
bool transaction_commited = cache_db_.commit(); bool transaction_commited = cache_db_.commit();
qDebug() << (transaction_commited ? "transaction commited for " : "transaction not commited for") << collection -> protocol(); if (transaction_commited) {
qDebug() << "transaction commited for " << collection -> protocol();
} else {
qDebug() << "transaction not commited for " << collection -> protocol() << ":" << cache_db_.lastError();
}
} }
} }
@@ -192,6 +196,7 @@ bool ElementsCollectionCache::fetchNameFromCache(const QString &path, const QDat
if (select_name_ -> exec()) { if (select_name_ -> exec()) {
if (select_name_ -> first()) { if (select_name_ -> first()) {
current_name_ = select_name_ -> value(0).toString(); current_name_ = select_name_ -> value(0).toString();
select_name_ -> finish();
return(true); return(true);
} }
} else { } else {
@@ -217,6 +222,7 @@ bool ElementsCollectionCache::fetchPixmapFromCache(const QString &path, const QD
// avoid returning always the same pixmap (i.e. same cacheKey()) // avoid returning always the same pixmap (i.e. same cacheKey())
current_pixmap_.detach(); current_pixmap_.detach();
current_pixmap_.loadFromData(ba, qPrintable(pixmap_storage_format_)); current_pixmap_.loadFromData(ba, qPrintable(pixmap_storage_format_));
select_pixmap_ -> finish();
} }
return(true); return(true);
} else { } else {