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 #1434 from ddnet/sql-locking

Browse source 
Sql locking
This commit is contained in:
Dennis Felsing 2019-02-27 20:26:24 +01:00 committed by GitHub
parent 887d1c8401 5ddcf8bd0c
commit 6701ae726f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,7 +36,15 @@ CSqlServer::~CSqlServer()
try
{
if (m_pResults)
{
delete m_pResults;
m_pResults = 0;
}
if (m_pStatement)
{
delete m_pStatement;
m_pStatement = 0;
}
if (m_pConnection)
{
delete m_pConnection;
@ -64,7 +72,7 @@ CSqlServer::~CSqlServer()
bool CSqlServer::Connect()
{
m_SqlLock.take();
scope_lock LockScope(&m_SqlLock);
if (m_pDriver != NULL && m_pConnection != NULL)
{
@ -91,7 +99,6 @@ bool CSqlServer::Connect()
dbg_msg("sql", "Unknown Error cause by the MySQL/C++ Connector");
}
m_SqlLock.release();
dbg_msg("sql", "ERROR: SQL connection failed");
return false;
}
@ -120,7 +127,7 @@ bool CSqlServer::Connect()
}
m_pConnection = m_pDriver->connect(connection_properties);
// Create Statement
// Create statement
m_pStatement = m_pConnection->createStatement();
if (m_SetUpDB)
@ -154,13 +161,11 @@ bool CSqlServer::Connect()
}
dbg_msg("sql", "ERROR: sql connection failed");
m_SqlLock.release();
return false;
}
void CSqlServer::Disconnect()
{
m_SqlLock.release();
}
void CSqlServer::CreateTables()
@ -200,16 +205,20 @@ void CSqlServer::CreateTables()
void CSqlServer::executeSql(const char *pCommand)
{
scope_lock LockScope(&m_SqlLock);
m_pStatement->execute(pCommand);
}
void CSqlServer::executeSqlQuery(const char *pQuery)
{
scope_lock LockScope(&m_SqlLock);
if (m_pResults)
{
delete m_pResults;
// set it to 0, so exceptions raised from executeQuery can not make m_pResults point to invalid memory
m_pResults = 0;
}
// set it to 0, so exceptions raised from executeQuery can not make m_pResults point to invalid memory
m_pResults = 0;
m_pResults = m_pStatement->executeQuery(pQuery);
}