dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use std::unique_ptr for stats-table
Some checks are pending
checkrefs / lfscheck (push) Waiting to run
Details
checkrefs / checkrefs (push) Waiting to run
Details
lint / cppcheck (push) Waiting to run
Details
lint / copyright (push) Waiting to run
Details
lint / jenkinsfiles (push) Waiting to run
Details
pre-commit / build (push) Waiting to run
Details

Browse source
This commit is contained in:
phosit 2026-04-16 19:18:12 +02:00
parent b71c1c3e8c
commit 6f82cec51f
No known key found for this signature in database
GPG key ID: C9430B600671C268
4 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/network/NetClientSession.cpp
View file

@ -42,8 +42,6 @@ CNetClientSession::CNetClientSession(CNetClient& client) :
CNetClientSession::~CNetClientSession()
{
ENSURE(!m_LoopRunning);
delete m_Stats;
}
bool CNetClientSession::Connect(const CStr& server, const u16 port, ENetHost* enetClient)
@ -70,9 +68,9 @@ bool CNetClientSession::Connect(const CStr& server, const u16 port, ENetHost* en
return false;
m_Stats = new CNetStatsTable(*m_Server);
m_Stats = std::make_unique<CNetStatsTable>(*m_Server);
if (CProfileViewer::IsInitialised())
g_ProfileViewer.AddRootTable(m_Stats);
g_ProfileViewer.AddRootTable(m_Stats.get());
return true;
}

2
source/network/NetClientSession.h
View file

@ -126,7 +126,7 @@ private:
std::unique_ptr<ENetHost, DestroyHost> m_Host;
std::unique_ptr<ENetPeer, DestroyPeer> m_Server;
CNetStatsTable* m_Stats{nullptr};
std::unique_ptr<CNetStatsTable> m_Stats;
};
#endif // NETSESSION_H

7
source/network/NetServer.cpp
View file

@ -132,9 +132,9 @@ CNetServerWorker::CNetServerWorker(const bool continueSavedGame, std::uint16_t p
throw std::runtime_error{"Failed to start server"};
}
m_Stats = new CNetStatsTable();
m_Stats = std::make_unique<CNetStatsTable>();
if (CProfileViewer::IsInitialised())
g_ProfileViewer.AddRootTable(m_Stats);
g_ProfileViewer.AddRootTable(m_Stats.get());
m_State = SERVER_STATE_PREGAME;
@ -165,9 +165,6 @@ CNetServerWorker::~CNetServerWorker()
#endif
// Clean up resources
delete m_Stats;
for (const auto& session : m_Sessions)
session->DisconnectNow(NDR_SERVER_SHUTDOWN);
}

2
source/network/NetServer.h
View file

@ -266,7 +266,7 @@ private:
std::unique_ptr<ENetHost, DestroyHost> m_Host;
std::vector<std::unique_ptr<CNetServerSession>> m_Sessions;
CNetStatsTable* m_Stats{nullptr};
std::unique_ptr<CNetStatsTable> m_Stats;
NetServerState m_State{SERVER_STATE_PREGAME};