UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

database: flip to recursive_mutex to allow nested locks (#1937)

Browse Source 
* Fix crash from db locking

* Change db lock to use recursive_mutex
This commit is contained in:
Corey D 2023-03-30 14:03:03 +11:00 committed by GitHub
parent 5ba9816377
commit c5087d7a39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/mysql/mysql/MyDatabase.h
View File

@ -70,7 +70,7 @@ public:
const DatabaseInfo &GetInfo(); const DatabaseInfo &GetInfo();
private: private:
MYSQL *m_mysql; MYSQL *m_mysql;
std::mutex m_FullLock; std::recursive_mutex m_FullLock;
/* ---------- */ /* ---------- */
DatabaseInfo m_Info; DatabaseInfo m_Info;

2
extensions/pgsql/pgsql/PgDatabase.h
View File

@ -71,7 +71,7 @@ public:
void SetLastIDAndRows(unsigned int insertID, unsigned int affectedRows); void SetLastIDAndRows(unsigned int insertID, unsigned int affectedRows);
private: private:
PGconn *m_pgsql; PGconn *m_pgsql;
std::mutex m_FullLock; std::recursive_mutex m_FullLock;
unsigned int m_lastInsertID; unsigned int m_lastInsertID;
unsigned int m_lastAffectedRows; unsigned int m_lastAffectedRows;

2
extensions/sqlite/driver/SqDatabase.h
View File

@ -70,7 +70,7 @@ public:
} }
private: private:
sqlite3 *m_sq3; sqlite3 *m_sq3;
std::mutex m_FullLock; std::recursive_mutex m_FullLock;
bool m_Persistent; bool m_Persistent;
String m_LastError; String m_LastError;
int m_LastErrorCode; int m_LastErrorCode;

4
plugins/include/dbi.inc
View File

@ -959,6 +959,10 @@ native bool SQL_Execute(Handle statement);
* If the lock cannot be acquired, the main thread will pause until the * If the lock cannot be acquired, the main thread will pause until the
* threaded operation has concluded. * threaded operation has concluded.
* *
* Care should be taken to not lock an already-locked database. Internally,
* lock calls are nested recursively and must be paired with an equal amount
* of unlocks to be undone. This behaviour should not be relied on.
*
* @param database A database Handle. * @param database A database Handle.
* @error Invalid database Handle. * @error Invalid database Handle.
*/ */