Make lmdb work with threads.

2 files changed, 12 insertions, 3 deletions

diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp
index b9a007d..ce77bbb 100644
--- a/common/storage_lmdb.cpp
+++ b/common/storage_lmdb.cpp
@@ -8,6 +8,7 @@
 #include <QReadWriteLock>
 #include <QString>
 #include <QTime>
+#include <QMutex>
 
 #include <lmdb.h>
 
@@ -26,8 +27,11 @@ public:
     AccessMode mode;
     bool readTransaction;
     bool firstOpen;
+    static QMutex sMutex;
 };
 
+QMutex Storage::Private::sMutex;
+
 Storage::Private::Private(const QString &s, const QString &n, AccessMode m)
     : storageRoot(s),
       name(n),
@@ -41,6 +45,9 @@ Storage::Private::Private(const QString &s, const QString &n, AccessMode m)
     dir.mkdir(storageRoot);
     dir.mkdir(fullPath);
 
+    //This seems to resolve threading related issues, not sure why though
+    QMutexLocker locker(&sMutex);
+
     //create file
     if (mdb_env_create(&env)) {
         // TODO: handle error
diff --git a/tests/storagetest.cpp b/tests/storagetest.cpp
index b3313c0..3c20135 100644
--- a/tests/storagetest.cpp
+++ b/tests/storagetest.cpp
@@ -126,15 +126,16 @@ private Q_SLOTS:
 
         populate(count);
 
+        bool error = false;
         //Try to concurrently read
         QList<QFuture<void> > futures;
-        const int concurrencyLevel = 4;
+        const int concurrencyLevel = 10;
         for (int num = 0; num < concurrencyLevel; num++) {
-            futures << QtConcurrent::run([this, count](){
+            futures << QtConcurrent::run([this, count, &error](){
                 Storage storage(testDataPath, dbName);
                 for (int i = 0; i < count; i++) {
                     if (!verify(storage, i)) {
-                        qWarning() << "invalid value";
+                        error = true;
                         break;
                     }
                 }
@@ -143,6 +144,7 @@ private Q_SLOTS:
         for(auto future : futures) {
             future.waitForFinished();
         }
+        QVERIFY(!error);
 
         Storage storage(testDataPath, dbName);
         storage.removeFromDisk();