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

Revert "Speedup server map change by threading SQL initialization"

Browse source 
Causes problems with high ping servers when initializiation wasn't done
and new map is voted.

This reverts commit 13a6f5f2e8.
This commit is contained in:
def 2013-10-15 07:07:33 +02:00
parent 13a6f5f2e8
commit 35996eaa69
2 changed files with 35 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
src/game/server/score/sql_score.cpp
View file

@ -36,46 +36,36 @@ CSqlScore::CSqlScore(CGameContext *pGameServer) : m_pGameServer(pGameServer),
}
void CSqlScore::LoadPointMapList()
{
void *Thread = thread_create(LoadPointMapListThread, this);
#if defined(CONF_FAMILY_UNIX)
pthread_detach((pthread_t)Thread);
#endif
}
void CSqlScore::LoadPointMapListThread(void *pUser)
{
lock_wait(gs_SqlLock);
CSqlScore *pScore = (CSqlScore *)pUser;
pScore->m_PointsSize = 0;
m_PointsSize = 0;
std::ifstream f("points.cfg");
if (f.fail())
return;
if(!pScore->Connect())
if(!Connect())
return;
pScore->m_PointsSize = std::count(std::istreambuf_iterator<char>(f), std::istreambuf_iterator<char>(), '\n');
m_PointsSize = std::count(std::istreambuf_iterator<char>(f), std::istreambuf_iterator<char>(), '\n');
f.seekg(0);
pScore->m_PointsInfos = new CPointsInfo[pScore->m_PointsSize];
m_PointsInfos = new CPointsInfo[m_PointsSize];
char aBuf[256];
unsigned int Position = 0;
while (f.getline(aBuf, 256) && Position < pScore->m_PointsSize)
while (f.getline(aBuf, 256) && Position < m_PointsSize)
{
CPointsInfo& Info = pScore->m_PointsInfos[Position];
CPointsInfo& Info = m_PointsInfos[Position];
if (sscanf(aBuf, "%u %127[^\t\n]", &Info.m_Points, Info.m_aMapName) == 2)
{
pScore->NormalizeMapname(Info.m_aMapName);
NormalizeMapname(Info.m_aMapName);
str_format(aBuf, sizeof(aBuf), "SELECT count(Name) FROM record_%s_race;", Info.m_aMapName);
try
{
pScore->m_pResults = pScore->m_pStatement->executeQuery(aBuf);
delete pScore->m_pResults;
m_pResults = m_pStatement->executeQuery(aBuf);
delete m_pResults;
}
catch (sql::SQLException &e)
{
@ -85,12 +75,12 @@ void CSqlScore::LoadPointMapListThread(void *pUser)
}
}
pScore->m_PointsSize = Position;
pScore->Disconnect();
m_PointsSize = Position;
lock_release(gs_SqlLock);
Disconnect();
return;
}
@ -215,71 +205,59 @@ void CSqlScore::Disconnect()
// create tables... should be done only once
void CSqlScore::Init()
{
void *Thread = thread_create(InitThread, this);
#if defined(CONF_FAMILY_UNIX)
pthread_detach((pthread_t)Thread);
#endif
}
void CSqlScore::InitThread(void* pUser)
{
lock_wait(gs_SqlLock);
CSqlScore *pScore = (CSqlScore *)pUser;
// create connection
if(pScore->Connect())
if(Connect())
{
try
{
// create tables
char aBuf[768];
str_format(aBuf, sizeof(aBuf), "CREATE TABLE IF NOT EXISTS %s_%s_race (Name VARCHAR(%d) NOT NULL, Timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP , Time FLOAT DEFAULT 0, cp1 FLOAT DEFAULT 0, cp2 FLOAT DEFAULT 0, cp3 FLOAT DEFAULT 0, cp4 FLOAT DEFAULT 0, cp5 FLOAT DEFAULT 0, cp6 FLOAT DEFAULT 0, cp7 FLOAT DEFAULT 0, cp8 FLOAT DEFAULT 0, cp9 FLOAT DEFAULT 0, cp10 FLOAT DEFAULT 0, cp11 FLOAT DEFAULT 0, cp12 FLOAT DEFAULT 0, cp13 FLOAT DEFAULT 0, cp14 FLOAT DEFAULT 0, cp15 FLOAT DEFAULT 0, cp16 FLOAT DEFAULT 0, cp17 FLOAT DEFAULT 0, cp18 FLOAT DEFAULT 0, cp19 FLOAT DEFAULT 0, cp20 FLOAT DEFAULT 0, cp21 FLOAT DEFAULT 0, cp22 FLOAT DEFAULT 0, cp23 FLOAT DEFAULT 0, cp24 FLOAT DEFAULT 0, cp25 FLOAT DEFAULT 0, KEY Name (Name)) CHARACTER SET utf8 ;", pScore->m_pPrefix, pScore->m_aMap, MAX_NAME_LENGTH);
pScore->m_pStatement->execute(aBuf);
str_format(aBuf, sizeof(aBuf), "CREATE TABLE IF NOT EXISTS %s_%s_race (Name VARCHAR(%d) NOT NULL, Timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP , Time FLOAT DEFAULT 0, cp1 FLOAT DEFAULT 0, cp2 FLOAT DEFAULT 0, cp3 FLOAT DEFAULT 0, cp4 FLOAT DEFAULT 0, cp5 FLOAT DEFAULT 0, cp6 FLOAT DEFAULT 0, cp7 FLOAT DEFAULT 0, cp8 FLOAT DEFAULT 0, cp9 FLOAT DEFAULT 0, cp10 FLOAT DEFAULT 0, cp11 FLOAT DEFAULT 0, cp12 FLOAT DEFAULT 0, cp13 FLOAT DEFAULT 0, cp14 FLOAT DEFAULT 0, cp15 FLOAT DEFAULT 0, cp16 FLOAT DEFAULT 0, cp17 FLOAT DEFAULT 0, cp18 FLOAT DEFAULT 0, cp19 FLOAT DEFAULT 0, cp20 FLOAT DEFAULT 0, cp21 FLOAT DEFAULT 0, cp22 FLOAT DEFAULT 0, cp23 FLOAT DEFAULT 0, cp24 FLOAT DEFAULT 0, cp25 FLOAT DEFAULT 0, KEY Name (Name)) CHARACTER SET utf8 ;", m_pPrefix, m_aMap, MAX_NAME_LENGTH);
m_pStatement->execute(aBuf);
str_format(aBuf, sizeof(aBuf), "CREATE TABLE IF NOT EXISTS %s_%s_teamrace (Name VARCHAR(%d) NOT NULL, Timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, Time FLOAT DEFAULT 0, ID VARBINARY(16) NOT NULL, KEY Name (Name)) CHARACTER SET utf8 ;", pScore->m_pPrefix, pScore->m_aMap, MAX_NAME_LENGTH);
pScore->m_pStatement->execute(aBuf);
str_format(aBuf, sizeof(aBuf), "CREATE TABLE IF NOT EXISTS %s_%s_teamrace (Name VARCHAR(%d) NOT NULL, Timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, Time FLOAT DEFAULT 0, ID VARBINARY(16) NOT NULL, KEY Name (Name)) CHARACTER SET utf8 ;", m_pPrefix, m_aMap, MAX_NAME_LENGTH);
m_pStatement->execute(aBuf);
// Check if table has new column with timestamp
str_format(aBuf, sizeof(aBuf), "SELECT column_name FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = '%s_%s_race' AND column_name = 'Timestamp'", pScore->m_pPrefix, pScore->m_aMap);
pScore->m_pResults = pScore->m_pStatement->executeQuery(aBuf);
str_format(aBuf, sizeof(aBuf), "SELECT column_name FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = '%s_%s_race' AND column_name = 'Timestamp'",m_pPrefix, m_aMap);
m_pResults = m_pStatement->executeQuery(aBuf);
if(pScore->m_pResults->rowsCount() < 1)
if(m_pResults->rowsCount() < 1)
{
// If not... add the column
str_format(aBuf, sizeof(aBuf), "ALTER TABLE %s_%s_race ADD Timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER Name, ADD INDEX(Name);", pScore->m_pPrefix, pScore->m_aMap);
pScore->m_pStatement->execute(aBuf);
str_format(aBuf, sizeof(aBuf), "ALTER TABLE %s_%s_race ADD Timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER Name, ADD INDEX(Name);",m_pPrefix, m_aMap);
m_pStatement->execute(aBuf);
}
// Check if table has new column with timestamp
str_format(aBuf, sizeof(aBuf), "SELECT column_name FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = '%s_%s_teamrace' AND column_name = 'Timestamp'", pScore->m_pPrefix, pScore->m_aMap);
delete pScore->m_pResults;
pScore->m_pResults = pScore->m_pStatement->executeQuery(aBuf);
str_format(aBuf, sizeof(aBuf), "SELECT column_name FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = '%s_%s_teamrace' AND column_name = 'Timestamp'",m_pPrefix, m_aMap);
delete m_pResults;
m_pResults = m_pStatement->executeQuery(aBuf);
if(pScore->m_pResults->rowsCount() < 1)
if(m_pResults->rowsCount() < 1)
{
// If not... add the column
str_format(aBuf, sizeof(aBuf), "ALTER TABLE %s_%s_teamrace ADD Timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER Name, ADD INDEX(Name);", pScore->m_pPrefix, pScore->m_aMap);
pScore->m_pStatement->execute(aBuf);
str_format(aBuf, sizeof(aBuf), "ALTER TABLE %s_%s_teamrace ADD Timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER Name, ADD INDEX(Name);",m_pPrefix, m_aMap);
m_pStatement->execute(aBuf);
}
dbg_msg("SQL", "Tables were created successfully");
// get the best time
str_format(aBuf, sizeof(aBuf), "SELECT Time FROM %s_%s_race ORDER BY `Time` ASC LIMIT 0, 1;", pScore->m_pPrefix, pScore->m_aMap);
delete pScore->m_pResults;
pScore->m_pResults = pScore->m_pStatement->executeQuery(aBuf);
str_format(aBuf, sizeof(aBuf), "SELECT Time FROM %s_%s_race ORDER BY `Time` ASC LIMIT 0, 1;", m_pPrefix, m_aMap);
delete m_pResults;
m_pResults = m_pStatement->executeQuery(aBuf);
if(pScore->m_pResults->next())
if(m_pResults->next())
{
((CGameControllerDDRace*)pScore->GameServer()->m_pController)->m_CurrentRecord = (float)pScore->m_pResults->getDouble("Time");
((CGameControllerDDRace*)GameServer()->m_pController)->m_CurrentRecord = (float)m_pResults->getDouble("Time");
dbg_msg("SQL", "Getting best time on server done");
}
// delete statement
delete pScore->m_pResults;
delete m_pResults;
}
catch (sql::SQLException &e)
{
@ -290,10 +268,8 @@ void CSqlScore::InitThread(void* pUser)
}
// disconnect from database
pScore->Disconnect();
Disconnect();
}
lock_release(gs_SqlLock);
}
// update stuff

2
src/game/server/score/sql_score.h
View file

@ -46,8 +46,6 @@ class CSqlScore: public IScore
return m_pServer;
}
static void InitThread(void *pUser);
static void LoadPointMapListThread(void *pUser);
static void LoadScoreThread(void *pUser);
static void SaveScoreThread(void *pUser);
static void SaveTeamScoreThread(void *pUser);