edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1277 from ddnet/fix-lock

Browse source 
Global lock for MySQL Connector's get_driver_instance (fixes #1131)
This commit is contained in:
Dennis Felsing 2018-08-27 11:02:12 +02:00 committed by GitHub
parent 48d1757793 4d634bb7fd
commit c4fdbbe514
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 41 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/engine/server/server.cpp
View file

@ -292,6 +292,8 @@ CServer::CServer()
#endif
#if defined (CONF_SQL)
m_GlobalSqlLock = lock_create();
for (int i = 0; i < MAX_SQLSERVERS; i++)
{
m_apSqlReadServers[i] = 0;
@ -307,6 +309,13 @@ CServer::CServer()
Init();
}
CServer::~CServer()
{
#if defined (CONF_SQL)
lock_destroy(m_GlobalSqlLock);
#endif
}
int CServer::TrySetClientName(int ClientID, const char *pName)
{
char aTrimmedName[64];
@ -2529,7 +2538,7 @@ void CServer::ConAddSqlServer(IConsole::IResult *pResult, void *pUserData)
{
if (!apSqlServers[i])
{
apSqlServers[i] = new CSqlServer(pResult->GetString(1), pResult->GetString(2), pResult->GetString(3), pResult->GetString(4), pResult->GetString(5), pResult->GetInteger(6), ReadOnly, SetUpDb);
apSqlServers[i] = new CSqlServer(pResult->GetString(1), pResult->GetString(2), pResult->GetString(3), pResult->GetString(4), pResult->GetString(5), pResult->GetInteger(6), pSelf->m_GlobalSqlLock, ReadOnly, SetUpDb);
if(SetUpDb)
{

2
src/engine/server/server.h
View file

@ -91,6 +91,7 @@ class CServer : public IServer
class IStorage *m_pStorage;
#if defined(CONF_SQL)
LOCK m_GlobalSqlLock;
CSqlServer *m_apSqlReadServers[MAX_SQLSERVERS];
CSqlServer *m_apSqlWriteServers[MAX_SQLSERVERS];
#endif
@ -227,6 +228,7 @@ public:
array<CNameBan> m_aNameBans;
CServer();
~CServer();
int TrySetClientName(int ClientID, const char *pName);

13
src/engine/server/sql_server.cpp
View file

@ -10,9 +10,10 @@
int CSqlServer::ms_NumReadServer = 0;
int CSqlServer::ms_NumWriteServer = 0;
CSqlServer::CSqlServer(const char *pDatabase, const char *pPrefix, const char *pUser, const char *pPass, const char *pIp, int Port, bool ReadOnly, bool SetUpDb) :
CSqlServer::CSqlServer(const char *pDatabase, const char *pPrefix, const char *pUser, const char *pPass, const char *pIp, int Port, LOCK &GlobalLock, bool ReadOnly, bool SetUpDb) :
m_Port(Port),
m_SetUpDB(SetUpDb)
m_SetUpDB(SetUpDb),
m_GlobalLock(GlobalLock)
{
str_copy(m_aDatabase, pDatabase, sizeof(m_aDatabase));
str_copy(m_aPrefix, pPrefix, sizeof(m_aPrefix));
@ -28,6 +29,7 @@ CSqlServer::CSqlServer(const char *pDatabase, const char *pPrefix, const char *p
ReadOnly ? ms_NumReadServer++ : ms_NumWriteServer++;
m_SqlLock = lock_create();
m_GlobalLock = GlobalLock;
}
CSqlServer::~CSqlServer()
@ -91,8 +93,8 @@ bool CSqlServer::Connect()
dbg_msg("sql", "Unknown Error cause by the MySQL/C++ Connector");
}
dbg_msg("sql", "ERROR: SQL connection failed");
UnLock();
dbg_msg("sql", "ERROR: SQL connection failed");
return false;
}
@ -114,7 +116,10 @@ bool CSqlServer::Connect()
connection_properties["OPT_CHARSET_NAME"] = sql::SQLString("utf8mb4");
// Create connection
m_pDriver = get_driver_instance();
{
LockScope globalLock(m_GlobalLock);
m_pDriver = get_driver_instance();
}
m_pConnection = m_pDriver->connect(connection_properties);
// Create Statement

21
src/engine/server/sql_server.h
View file

@ -7,10 +7,28 @@
#include <cppconn/exception.h>
#include <cppconn/statement.h>
class LockScope
{
public:
LockScope(LOCK &Lock) :
m_Lock(Lock)
{
lock_wait(m_Lock);
}
~LockScope()
{
lock_unlock(m_Lock);
}
private:
LOCK &m_Lock;
};
class CSqlServer
{
public:
CSqlServer(const char *pDatabase, const char *pPrefix, const char *pUser, const char *pPass, const char *pIp, int Port, bool ReadOnly = true, bool SetUpDb = false);
CSqlServer(const char *pDatabase, const char *pPrefix, const char *pUser, const char *pPass, const char *pIp, int Port, LOCK &GlobalLock, bool ReadOnly = true, bool SetUpDb = false);
~CSqlServer();
bool Connect();
@ -52,6 +70,7 @@ private:
bool m_SetUpDB;
LOCK m_SqlLock;
LOCK &m_GlobalLock;
};
#endif