mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-21 04:05:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use StructuredClone in m_GuiMessageQueue

Browse Source 
The elements have to be cloned either way. Now they don't have to be
traced when they are in the queue.
This commit is contained in:
phosit
2024-11-10 18:18:40 +01:00
parent 2a2d5de350
commit f23dde2f73
3 changed files with 11 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/network/NetClient.cpp
+3 -12
View File
@@ -77,8 +77,6 @@ CNetClient::CNetClient(CGame* game, const CStrW& username, const CStr& hostJID)
{
m_Game->SetTurnManager(NULL); // delete the old local turn manager so we don't accidentally use it
JS_AddExtraGCRootsTracer(GetScriptInterface().GetGeneralJSContext(), CNetClient::Trace, this);
// Set up transitions for session
AddTransition(NCS_UNCONNECTED, (uint)NMT_CONNECT_COMPLETE, NCS_CONNECT, &OnConnect, this);
@@ -146,13 +144,6 @@ CNetClient::~CNetClient()
m_ClientTurnManager->OnDestroyConnection();
DestroyConnection();
JS_RemoveExtraGCRootsTracer(GetScriptInterface().GetGeneralJSContext(), CNetClient::Trace, this);
}
void CNetClient::TraceMember(JSTracer *trc)
{
for (JS::Heap<JS::Value>& guiMessage : m_GuiMessageQueue)
JS::TraceEdge(trc, &guiMessage, "m_GuiMessageQueue");
}
void CNetClient::SetGamePassword(const CStr& hashedPassword)
@@ -366,7 +357,7 @@ void CNetClient::CheckServerConnection()
}
}
void CNetClient::GuiPoll(JS::MutableHandleValue ret)
void CNetClient::GuiPoll(const ScriptRequest& rq, JS::MutableHandleValue ret)
{
if (m_GuiMessageQueue.empty())
{
@@ -374,7 +365,7 @@ void CNetClient::GuiPoll(JS::MutableHandleValue ret)
return;
}
ret.set(m_GuiMessageQueue.front());
Script::ReadStructuredClone(rq, m_GuiMessageQueue.front(), ret);
m_GuiMessageQueue.pop_front();
}
@@ -386,7 +377,7 @@ std::string CNetClient::TestReadGuiMessages()
JS::RootedValue msg(rq.cx);
while (true)
{
GuiPoll(&msg);
GuiPoll(rq, &msg);
if (msg.isUndefined())
break;
r += Script::ToString(rq, &msg) + "\n";