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

Thread safe /rank

Browse source
This commit is contained in:
Zwelf 2020-05-29 14:45:05 +02:00
parent 91e286f54d
commit eda0bab4bb
2 changed files with 53 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -188,7 +188,7 @@ bool CSqlScore::Init(CSqlServer* pSqlServer, const CSqlData<CSqlResult> *pGameDa
void CSqlScore::CheckBirthday(int ClientID) void CSqlScore::CheckBirthday(int ClientID)
{ {
/* /*
CSqlPlayerData *Tmp = new CSqlPlayerData(); CSqlPlayerRequest *Tmp = new CSqlPlayerRequest();
Tmp->m_ClientID = ClientID; Tmp->m_ClientID = ClientID;
Tmp->m_Name = Server()->ClientName(ClientID); Tmp->m_Name = Server()->ClientName(ClientID);
thread_init_and_detach(ExecSqlFunc, new CSqlExecData(CheckBirthdayThread, Tmp), "birthday check"); thread_init_and_detach(ExecSqlFunc, new CSqlExecData(CheckBirthdayThread, Tmp), "birthday check");
@ -804,20 +804,22 @@ bool CSqlScore::SaveTeamScoreThread(CSqlServer* pSqlServer, const CSqlData<CSqlP
void CSqlScore::ShowRank(int ClientID, const char* pName) void CSqlScore::ShowRank(int ClientID, const char* pName)
{ {
/* auto pResult = NewSqlPlayerResult(ClientID);
CSqlScoreData *Tmp = new CSqlScoreData(); if(pResult == nullptr)
Tmp->m_ClientID = ClientID; return;
Tmp->m_Name = pName; CSqlPlayerRequest *Tmp = new CSqlPlayerRequest(pResult);
str_copy(Tmp->m_aRequestingPlayer, Server()->ClientName(ClientID), sizeof(Tmp->m_aRequestingPlayer)); Tmp->m_Player = pName;
Tmp->m_Map = g_Config.m_SvMap;
Tmp->m_RequestingPlayer = Server()->ClientName(ClientID);
thread_init_and_detach(ExecSqlFunc, new CSqlExecData(ShowRankThread, Tmp), "show rank"); thread_init_and_detach(CSqlExecData<CSqlPlayerResult>::ExecSqlFunc,
*/ new CSqlExecData<CSqlPlayerResult>(ShowRankThread, Tmp),
"show rank");
} }
bool CSqlScore::ShowRankThread(CSqlServer* pSqlServer, const CSqlData<CSqlPlayerResult> *pGameData, bool HandleFailure) bool CSqlScore::ShowRankThread(CSqlServer* pSqlServer, const CSqlData<CSqlPlayerResult> *pGameData, bool HandleFailure)
{ {
/* const CSqlPlayerRequest *pData = dynamic_cast<const CSqlPlayerRequest *>(pGameData);
const CSqlScoreData *pData = dynamic_cast<const CSqlScoreData *>(pGameData);
if (HandleFailure) if (HandleFailure)
return true; return true;
@ -830,14 +832,33 @@ bool CSqlScore::ShowRankThread(CSqlServer* pSqlServer, const CSqlData<CSqlPlayer
pSqlServer->executeSql("SET @prev := NULL;"); pSqlServer->executeSql("SET @prev := NULL;");
pSqlServer->executeSql("SET @rank := 1;"); pSqlServer->executeSql("SET @rank := 1;");
pSqlServer->executeSql("SET @pos := 0;"); pSqlServer->executeSql("SET @pos := 0;");
str_format(aBuf, sizeof(aBuf), "SELECT Rank, Name, Time FROM (SELECT Name, (@pos := @pos+1) pos, (@rank := IF(@prev = Time,@rank, @pos)) rank, (@prev := Time) Time FROM (SELECT Name, min(Time) as Time FROM %s_race WHERE Map = '%s' GROUP BY Name ORDER BY `Time` ASC) as a) as b WHERE Name = '%s';", pSqlServer->GetPrefix(), pData->m_Map.ClrStr(), pData->m_Name.ClrStr()); str_format(aBuf, sizeof(aBuf),
"SELECT Rank, Name, Time "
"FROM ("
"SELECT "
"Name, (@pos := @pos+1) pos, "
"(@rank := IF(@prev = Time,@rank, @pos)) rank, "
"(@prev := Time) Time "
"FROM ("
"SELECT Name, min(Time) as Time "
"FROM %s_race "
"WHERE Map = '%s' "
"GROUP BY Name "
"ORDER BY `Time` ASC"
") as a"
") as b "
"WHERE Name = '%s';",
pSqlServer->GetPrefix(),
pData->m_Map.ClrStr(),
pData->m_Player.ClrStr()
);
pSqlServer->executeSqlQuery(aBuf); pSqlServer->executeSqlQuery(aBuf);
if(pSqlServer->GetResults()->rowsCount() != 1) if(pSqlServer->GetResults()->rowsCount() != 1)
{ {
str_format(aBuf, sizeof(aBuf), "%s is not ranked", pData->m_Name.Str()); str_format(pData->m_pResult->m_aaMessages[0], sizeof(pData->m_pResult->m_aaMessages[0]),
pData->GameServer()->SendChatTarget(pData->m_ClientID, aBuf); "%s is not ranked", pData->m_Player.Str());
} }
else else
{ {
@ -847,17 +868,21 @@ bool CSqlScore::ShowRankThread(CSqlServer* pSqlServer, const CSqlData<CSqlPlayer
int Rank = pSqlServer->GetResults()->getInt("Rank"); int Rank = pSqlServer->GetResults()->getInt("Rank");
if(g_Config.m_SvHideScore) if(g_Config.m_SvHideScore)
{ {
str_format(aBuf, sizeof(aBuf), "Your time: %02d:%05.2f", (int)(Time/60), Time-((int)Time/60*60)); str_format(pData->m_pResult->m_aaMessages[0], sizeof(pData->m_pResult->m_aaMessages[0]),
pData->GameServer()->SendChatTarget(pData->m_ClientID, aBuf); "Your time: %02d:%05.2f", (int)(Time/60), Time-((int)Time/60*60));
} }
else else
{ {
str_format(aBuf, sizeof(aBuf), "%d. %s Time: %02d:%05.2f, requested by %s", Rank, pSqlServer->GetResults()->getString("Name").c_str(), (int)(Time/60), Time-((int)Time/60*60), pData->m_aRequestingPlayer); pData->m_pResult->m_MessageTarget = CSqlPlayerResult::ALL;
pData->GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aBuf, pData->m_ClientID); str_format(pData->m_pResult->m_aaMessages[0], sizeof(pData->m_pResult->m_aaMessages[0]),
"%d. %s Time: %02d:%05.2f, requested by %s",
Rank, pSqlServer->GetResults()->getString("Name").c_str(),
(int)(Time/60), Time-((int)Time/60*60), pData->m_RequestingPlayer.Str());
} }
} }
dbg_msg("sql", "Showing rank done"); dbg_msg("sql", "Showing rank done");
pData->m_pResult->m_Done = true;
return true; return true;
} }
catch (sql::SQLException &e) catch (sql::SQLException &e)
@ -865,13 +890,6 @@ bool CSqlScore::ShowRankThread(CSqlServer* pSqlServer, const CSqlData<CSqlPlayer
dbg_msg("sql", "MySQL Error: %s", e.what()); dbg_msg("sql", "MySQL Error: %s", e.what());
dbg_msg("sql", "ERROR: Could not show rank"); dbg_msg("sql", "ERROR: Could not show rank");
} }
catch (CGameContextError &e)
{
dbg_msg("sql", "WARNING: Aborted showing rank due to reload/change of map.");
return true;
}
return false;
*/
return false; return false;
} }

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

@ -88,6 +88,14 @@ struct CSqlMapData : CSqlData<CSqlPlayerResult>
sqlstr::CSqlString<MAX_NAME_LENGTH> m_Name; sqlstr::CSqlString<MAX_NAME_LENGTH> m_Name;
}; };
struct CSqlPlayerRequest : CSqlData<CSqlPlayerResult>
{
using CSqlData<CSqlPlayerResult>::CSqlData;
sqlstr::CSqlString<MAX_NAME_LENGTH> m_Player;
sqlstr::CSqlString<MAX_NAME_LENGTH> m_Map;
sqlstr::CSqlString<MAX_NAME_LENGTH> m_RequestingPlayer;
};
// used for mapvote // used for mapvote
struct CSqlMapVoteData : CSqlMapData struct CSqlMapVoteData : CSqlMapData
{ {
@ -186,8 +194,6 @@ class CSqlScore: public IScore
static bool LoadScoreThread(CSqlServer* pSqlServer, const CSqlData<CSqlResult> *pGameData, bool HandleFailure = false); static bool LoadScoreThread(CSqlServer* pSqlServer, const CSqlData<CSqlResult> *pGameData, bool HandleFailure = false);
static bool MapInfoThread(CSqlServer* pSqlServer, const CSqlData<CSqlPlayerResult> *pGameData, bool HandleFailure = false); static bool MapInfoThread(CSqlServer* pSqlServer, const CSqlData<CSqlPlayerResult> *pGameData, bool HandleFailure = false);
static bool SaveScoreThread(CSqlServer* pSqlServer, const CSqlData<CSqlPlayerResult> *pGameData, bool HandleFailure = false);
static bool SaveTeamScoreThread(CSqlServer* pSqlServer, const CSqlData<CSqlPlayerResult> *pGameData, bool HandleFailure = false);
static bool ShowRankThread(CSqlServer* pSqlServer, const CSqlData<CSqlPlayerResult> *pGameData, bool HandleFailure = false); static bool ShowRankThread(CSqlServer* pSqlServer, const CSqlData<CSqlPlayerResult> *pGameData, bool HandleFailure = false);
static bool ShowTop5Thread(CSqlServer* pSqlServer, const CSqlData<CSqlPlayerResult> *pGameData, bool HandleFailure = false); static bool ShowTop5Thread(CSqlServer* pSqlServer, const CSqlData<CSqlPlayerResult> *pGameData, bool HandleFailure = false);
static bool ShowTeamRankThread(CSqlServer* pSqlServer, const CSqlData<CSqlPlayerResult> *pGameData, bool HandleFailure = false); static bool ShowTeamRankThread(CSqlServer* pSqlServer, const CSqlData<CSqlPlayerResult> *pGameData, bool HandleFailure = false);
@ -200,6 +206,9 @@ class CSqlScore: public IScore
static bool SaveTeamThread(CSqlServer* pSqlServer, const CSqlData<CSqlResult> *pGameData, bool HandleFailure = false); static bool SaveTeamThread(CSqlServer* pSqlServer, const CSqlData<CSqlResult> *pGameData, bool HandleFailure = false);
static bool LoadTeamThread(CSqlServer* pSqlServer, const CSqlData<CSqlResult> *pGameData, bool HandleFailure = false); static bool LoadTeamThread(CSqlServer* pSqlServer, const CSqlData<CSqlResult> *pGameData, bool HandleFailure = false);
static bool SaveScoreThread(CSqlServer* pSqlServer, const CSqlData<CSqlPlayerResult> *pGameData, bool HandleFailure = false);
static bool SaveTeamScoreThread(CSqlServer* pSqlServer, const CSqlData<CSqlPlayerResult> *pGameData, bool HandleFailure = false);
CGameContext *GameServer() { return m_pGameServer; } CGameContext *GameServer() { return m_pGameServer; }
IServer *Server() { return m_pServer; } IServer *Server() { return m_pServer; }