lock more carefully

Author: JorisGoosen

CommonData/databaseinterface.cpp

@@ -2051,11 +2051,14 @@ sqlite3 * DatabaseInterface::_db()
 		return _dbCreated;
 
 	_dbCheckMutex.lock();
-	if(!_dbs.count(id))
+	bool itsNotThereYet = !_dbs.count(id); //tip toe around the map
+	_dbCheckMutex.unlock();
+
+	if(itsNotThereYet)
 		load();
 
+	_dbCheckMutex.lock();
 	sqlite3 * dbFound = _dbs.at(id);
-
 	_dbCheckMutex.unlock();
 
 	return dbFound;
@@ -2169,7 +2172,9 @@ void DatabaseInterface::load()
         else
             Log::log() << "Opened internal sqlite database for loading at '" << dbFile() << "'. This is for thread " << std::this_thread::get_id() << std::endl;
 
+		_dbCheckMutex.lock();
         _dbs[std::this_thread::get_id()] = db;
+		_dbCheckMutex.unlock();
 
 		sqlite3_busy_timeout(db, 100);
 
@@ -2211,6 +2216,8 @@ void DatabaseInterface::close()
 
 	std::set<sqlite3*> waitingFor;
 
+	_dbCheckMutex.lock();
+
 	for(auto & idDb : _dbs)
 		waitingFor.insert(idDb.second);
 
@@ -2231,6 +2238,8 @@ void DatabaseInterface::close()
 	while(waitingFor.size() > 0);
 
 	_dbs.clear();
+
+	_dbCheckMutex.unlock();
 
 	while(sqlite3_close(_dbCreated) != SQLITE_OK)
 	{

CommonData/databaseinterface.h

@@ -208,7 +208,8 @@ class DatabaseInterface
 	std::thread::id							_dbCreator;
 	sqlite3*								_dbCreated = nullptr;
 	bool									_inMemory;
-    std::mutex                              _loadMutex;
+	std::mutex                              _loadMutex,
+											_dbCheckMutex;
 
 	static			std::string _wrap_sqlite3_column_text(sqlite3_stmt * stmt, int iCol);
 	static const	std::string _dbConstructionSql;